diff options
1512 files changed, 3822 insertions, 3421 deletions
@@ -4128,3 +4128,5 @@ security/smtpmap||2009-07-28|Has expired: depends on GCC 2.95 which has not been devel/boost|devel/boost-libs|2009-07-28|Boost ports were split and sliced devel/boost-python|devel/boost-python-libs|2009-07-28|Boost ports were split and sliced www/xpi-firegpg||2009-07-31|Removed +devel/libtool15|devel/libtool22|2009-08-02|Update to libtool22 +devel/libltdl15|devel/libltdl22|2009-08-02|Update to libltdl22 diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index 4fe59ce24b62..e09fcaea8fe1 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -175,10 +175,10 @@ BUILD_DEPENDS+= ${AUTOCONF_DEPENDS} #--------------------------------------------------------------------------- # Convenience function to save people having to depend directly on -# devel/libltdl15 +# devel/libltdl22 # .if defined(AUTOTOOL_libltdl) -LIB_DEPENDS+= ltdl.4:${PORTSDIR}/devel/libltdl15 +LIB_DEPENDS+= ltdl.7:${PORTSDIR}/devel/libltdl22 .endif .if defined(AUTOTOOL_libtool) @@ -202,7 +202,7 @@ LIBTOOLIZE= ${LOCALBASE}/bin/libtoolize LIBTOOL_LIBEXECDIR= ${LOCALBASE}/libexec/libtool LIBTOOL_SHAREDIR= ${LOCALBASE}/share/libtool LIBTOOL_M4= ${LOCALBASE}/share/aclocal/libtool.m4 -LTMAIN= ${LIBTOOL_SHAREDIR}/ltmain.sh +LTMAIN= ${LIBTOOL_SHAREDIR}/config/ltmain.sh LIBTOOL_VARS= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} LIBTOOL_M4=${LIBTOOL_M4} LIBTOOL_DEPENDS= ${LIBTOOL}:${PORTSDIR}/devel/libtool${LIBTOOL_VERSION} @@ -6,6 +6,22 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20090802: + AFFECTS: users of devel/libtool15 and devel/libltdl15 + AUTHOR: mezz@FreeBSD.org + + The devel/libtool15 and devel/libltdl15 have been moved to libtool22 and + libltdl22 then updated to 2.2.6a. You will need to run portmaster or + portupgrade: + + portmaster -o devel/libtool22 libtool-1.5\* + portmaster -o devel/libltdl22 libltdl-1.5\* + + Same way as for portupgrade by replace from 'portmaster' to 'portupgrade'. + After that, you will need to rebuild all ports that depend on libltdl, since + all ports' PORTREVISION has been bump so you can run with '-a' of either + portmaster or portupgrade. + 20090801: AFFECTS: users of x11-drivers/xf86-video-nouveau AUTHOR: rnoland@FreeBSD.org diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile index 73747e615ba0..1ddee5de38bd 100644 --- a/accessibility/atk/Makefile +++ b/accessibility/atk/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 ltverhack referencehack CONFIGURE_ARGS= --enable-static \ --disable-gtk-doc \ diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile index 801ef1c0b591..98345e7a5714 100644 --- a/accessibility/gnome-mag/Makefile +++ b/accessibility/gnome-mag/Makefile @@ -20,7 +20,7 @@ USE_XORG= xfixes xdamage ice xcomposite sm USE_GNOME= gnomehack gnomeprefix atspi libbonobo intlhack ltverhack USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/accessibility/kdeaccessibility/Makefile b/accessibility/kdeaccessibility/Makefile index 90fa1927c3d3..9f2814ea3874 100644 --- a/accessibility/kdeaccessibility/Makefile +++ b/accessibility/kdeaccessibility/Makefile @@ -21,7 +21,7 @@ PREFIX= ${KDE_PREFIX} USE_XORG= xtst USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes .include "${.CURDIR}/../../x11/kde3/Makefile.kde" diff --git a/archivers/kbackup/Makefile b/archivers/kbackup/Makefile index 9725dabc15ad..66b2a7156c9a 100644 --- a/archivers/kbackup/Makefile +++ b/archivers/kbackup/Makefile @@ -17,7 +17,7 @@ COMMENT= A program for back up of directories or files USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GETTEXT= yes USE_KDELIBS_VER=3 diff --git a/archivers/kio_p7zip/Makefile b/archivers/kio_p7zip/Makefile index cad8e9def996..cdbf48838538 100644 --- a/archivers/kio_p7zip/Makefile +++ b/archivers/kio_p7zip/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_QT_VER= 3 USE_KDELIBS_VER=3 GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile index 3a1e714e8d80..f0bd6afdf877 100644 --- a/archivers/libcomprex/Makefile +++ b/archivers/libcomprex/Makefile @@ -8,7 +8,7 @@ PORTNAME= libcomprex PORTVERSION= 0.3.3 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= archivers MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnupdate @@ -19,7 +19,7 @@ COMMENT= Transparently handles automatic compression and decompression of files #LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" diff --git a/archivers/libcomprex/files/patch-Makefile.in b/archivers/libcomprex/files/patch-Makefile.in deleted file mode 100644 index 1a68fb3fb821..000000000000 --- a/archivers/libcomprex/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Mar 6 13:30:58 2003 -+++ Makefile.in Tue Oct 28 13:55:01 2003 -@@ -126,7 +126,7 @@ - modlibdir = @modlibdir@ - sedpath = @sedpath@ - --@DYNAMIC_MODS_TRUE@LIBLTDLDIR = libltdl -+@DYNAMIC_MODS_TRUE@LIBLTDLDIR = - - SUBDIRS = debian docs intl $(LIBLTDLDIR) modules libcomprex po tests - diff --git a/archivers/libcomprex/files/patch-libcomprex::Makefile.in b/archivers/libcomprex/files/patch-libcomprex::Makefile.in deleted file mode 100644 index 7ed62a5a53f2..000000000000 --- a/archivers/libcomprex/files/patch-libcomprex::Makefile.in +++ /dev/null @@ -1,21 +0,0 @@ ---- libcomprex/Makefile.in.orig Thu Mar 6 13:33:01 2003 -+++ libcomprex/Makefile.in Tue Oct 28 13:56:41 2003 -@@ -161,7 +161,7 @@ - utils.c - - --libcomprex_la_LIBADD = @DLLDFLAGS@ $(LIBLTDL) $(STATIC_LINK_LIBS) -+libcomprex_la_LIBADD = @DLLDFLAGS@ -lltdl $(STATIC_LINK_LIBS) - - libcomprex_la_LDFLAGS = \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -@@ -169,8 +169,7 @@ - - INCLUDES = \ - -I$(top_srcdir) \ -- -DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" \ -- $(INCLTDL) -+ -DCOMPREX_LIBDIR=\""$(libdir)/comprex"\" - - subdir = libcomprex - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/archivers/libdynamite/Makefile b/archivers/libdynamite/Makefile index 273c3a25d65c..693501480550 100644 --- a/archivers/libdynamite/Makefile +++ b/archivers/libdynamite/Makefile @@ -16,7 +16,7 @@ COMMENT= Decompress data compressed with PKWARE Data Compression Library MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_LDCONFIG= yes diff --git a/archivers/libmspack/Makefile b/archivers/libmspack/Makefile index 39dec10b05de..3d8f8b1f75f6 100644 --- a/archivers/libmspack/Makefile +++ b/archivers/libmspack/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}alpha MAINTAINER= fjoe@FreeBSD.org COMMENT= A library for Microsoft compression formats -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/archivers/liborange/Makefile b/archivers/liborange/Makefile index 2b9c08d310b9..f467762f16d3 100644 --- a/archivers/liborange/Makefile +++ b/archivers/liborange/Makefile @@ -26,7 +26,7 @@ OPTIONS= LIBSYNCE "Build with libsynce support" on \ MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_ICONV= yes diff --git a/archivers/librtfcomp/Makefile b/archivers/librtfcomp/Makefile index 35bf326e1d32..13f57282c2e8 100644 --- a/archivers/librtfcomp/Makefile +++ b/archivers/librtfcomp/Makefile @@ -16,7 +16,7 @@ COMMENT?= LZRTF compression library MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile index ca5138ff3dd2..d7a8807bbe01 100644 --- a/archivers/lzo/Makefile +++ b/archivers/lzo/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= libs/compression MAINTAINER= matthias.andree@gmx.de COMMENT= Portable speedy, lossless data compression library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile index 56ad60beca8e..3a7407165779 100644 --- a/archivers/lzo2/Makefile +++ b/archivers/lzo2/Makefile @@ -18,7 +18,7 @@ DISTNAME= lzo-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX} MAINTAINER= matthias.andree@gmx.de COMMENT= Portable speedy, lossless data compression library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared USE_LDCONFIG= yes diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 9ecb943fa05f..08eabde03ebf 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -21,7 +21,7 @@ CONFLICTS= rpm-4.* rpm-5.* USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= automake:14 autoconf:213 libtool:15 +USE_AUTOTOOLS= automake:14 autoconf:213 libtool:22 CONFIGURE_ARGS= --with-glob USE_LDCONFIG= yes MAKE_ENV= OLD_PO_FILE_INPUT=1 diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 04337d653d0f..7d68a2f7fc7a 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure db3/configure db/dist/configure popt/configure \ beecrypt/configure USE_GMAKE= yes diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile index 590a599fa746..2a7a56089cf4 100644 --- a/archivers/rpm5/Makefile +++ b/archivers/rpm5/Makefile @@ -28,7 +28,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen \ .endif DB_VERSION?= 45 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure db3/configure db/dist/configure \ file/configure zlib/configure xar/configure USE_GMAKE= yes diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile index 5f9511728c61..3d2baece1c8e 100644 --- a/archivers/ucl/Makefile +++ b/archivers/ucl/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.oberhumer.com/opensource/ucl/download/ MAINTAINER= ports@FreeBSD.org COMMENT= A data compression library with low memory usage -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared diff --git a/archivers/unshield/Makefile b/archivers/unshield/Makefile index a4065b06025d..521bf67432a4 100644 --- a/archivers/unshield/Makefile +++ b/archivers/unshield/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=synce MAINTAINER= sunpoet@sunpoet.net COMMENT= Extract data from InstallShield CAB files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack gnometarget USE_LDCONFIG= yes diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile index 0b5e22bd577d..8de486d85138 100644 --- a/archivers/xpk/Makefile +++ b/archivers/xpk/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://vesuri.jormas.com/xpk/ \ MAINTAINER= ports@FreeBSD.org COMMENT= The eXternal PacKer (XPK) library system -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index eaeb8ab5d74d..495142620a05 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -18,7 +18,7 @@ COMMENT= Scriptable space flight simulator for X LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GL= gl USE_XORG= x11 xt xext xmu xi diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile index e4f53d7590ab..4d5070dcfa0a 100644 --- a/astro/gpsd/Makefile +++ b/astro/gpsd/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt USE_RC_SUBR= gpsd -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack pkgconfig USE_LDCONFIG= yes diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile index cecd000bea89..0da694afe5c9 100644 --- a/astro/gpsdrive/Makefile +++ b/astro/gpsdrive/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ LDFLAGS=-L${LOCALBASE}/lib diff --git a/astro/jday/Makefile b/astro/jday/Makefile index a60532f59bdf..151aba42e900 100644 --- a/astro/jday/Makefile +++ b/astro/jday/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Astronomical julian date calculator -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/astro/libnova/Makefile b/astro/libnova/Makefile index 9c8f2dbde6d8..b93599f39650 100644 --- a/astro/libnova/Makefile +++ b/astro/libnova/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= dhn@FreeBSD.org COMMENT= Astronomical Calculation Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/astro/nova/Makefile b/astro/nova/Makefile index ab3c6f191a18..0509f16e48a3 100644 --- a/astro/nova/Makefile +++ b/astro/nova/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ nova:${PORTSDIR}/astro/libnova RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --datadir=${DATADIR} diff --git a/astro/orsa/Makefile b/astro/orsa/Makefile index 894632e1d90a..d2901dd628ef 100644 --- a/astro/orsa/Makefile +++ b/astro/orsa/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= gsl.13:${PORTSDIR}/math/gsl \ USE_QT_VER= 3 USE_GL= gl USE_GMAKE= yes -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I macros -I ${LOCALBASE}/share/aclocal CONFIGURE_ENV= ac_cv_c_inline=no USE_LDCONFIG= yes diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile index 46ff6d2392b1..0f95ea0749f9 100644 --- a/audio/Maaate/Makefile +++ b/audio/Maaate/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/M/m/} MAINTAINER= ports@FreeBSD.org COMMENT= MPEG audio analysis toolkit -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/akode-plugins-ffmpeg/Makefile b/audio/akode-plugins-ffmpeg/Makefile index 9ae86c3f74ef..ed8c3d5ec9a7 100644 --- a/audio/akode-plugins-ffmpeg/Makefile +++ b/audio/akode-plugins-ffmpeg/Makefile @@ -25,7 +25,7 @@ PLUGIN= ffmpeg_decoder PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile index b3af1ba8b34d..e489db73a32c 100644 --- a/audio/akode-plugins-jack/Makefile +++ b/audio/akode-plugins-jack/Makefile @@ -25,7 +25,7 @@ PLUGIN= jack_sink PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-mpc/Makefile b/audio/akode-plugins-mpc/Makefile index 8d1b22a55b76..741f35b59096 100644 --- a/audio/akode-plugins-mpc/Makefile +++ b/audio/akode-plugins-mpc/Makefile @@ -24,7 +24,7 @@ PLUGIN= mpc_decoder PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-mpeg/Makefile b/audio/akode-plugins-mpeg/Makefile index e214721e5dc7..8ad45f05eef2 100644 --- a/audio/akode-plugins-mpeg/Makefile +++ b/audio/akode-plugins-mpeg/Makefile @@ -26,7 +26,7 @@ PLUGIN= mpeg_decoder PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-oss/Makefile b/audio/akode-plugins-oss/Makefile index 668218e8a41f..2008dd616b1c 100644 --- a/audio/akode-plugins-oss/Makefile +++ b/audio/akode-plugins-oss/Makefile @@ -24,7 +24,7 @@ PLUGIN= oss_sink PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-pulseaudio/Makefile b/audio/akode-plugins-pulseaudio/Makefile index df16b68fa2d7..e3fdbd248b96 100644 --- a/audio/akode-plugins-pulseaudio/Makefile +++ b/audio/akode-plugins-pulseaudio/Makefile @@ -25,7 +25,7 @@ PLUGIN= polyp_sink PORTNAMESUFX= pulseaudio USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-resampler/Makefile b/audio/akode-plugins-resampler/Makefile index f0a6be11fc5f..da7c4bf0faa1 100644 --- a/audio/akode-plugins-resampler/Makefile +++ b/audio/akode-plugins-resampler/Makefile @@ -25,7 +25,7 @@ PLUGIN= src_resampler PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile index 1817fa198e66..864870e4ed50 100644 --- a/audio/akode-plugins-xiph/Makefile +++ b/audio/akode-plugins-xiph/Makefile @@ -29,7 +29,7 @@ PLUGIN= xiph_decoder PORTNAMESUFX= ${PLUGIN:S/_sink//:S/_decoder//:S/src_//} USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/akode-${PORTVERSION} diff --git a/audio/akode/Makefile b/audio/akode/Makefile index fc3767295e41..17b469f140b4 100644 --- a/audio/akode/Makefile +++ b/audio/akode/Makefile @@ -28,7 +28,7 @@ OPTIONS= FFMPEG "FFMPEG decoder plugin" off \ XIPH "FLAC/Speex/Vorbis decoder plugin" on USE_AUTOTOOLS= libltdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 55b8a682a194..0f7897f24366 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -3,6 +3,7 @@ # Whom: Markus Brueffer <markus@FreeBSD.org> # # $FreeBSD$ +# PORTNAME= amarok PORTVERSION= 1.4.10 @@ -24,7 +25,7 @@ MIN_OPTIONS_VER= ${PORTNAME}-1.4.1 USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_SDL= sdl USE_RUBY= yes diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist index 92f26b906bc0..5fac640aa557 100644 --- a/audio/amarok/pkg-plist +++ b/audio/amarok/pkg-plist @@ -41,7 +41,6 @@ lib/libamarok.la lib/libamarok.so lib/libamarok.so.0 lib/ruby_lib/http11.rb -lib/ruby_lib/libhttp11.a lib/ruby_lib/libhttp11.la lib/ruby_lib/libhttp11.so lib/ruby_lib/libhttp11.so.0 diff --git a/audio/arts/Makefile b/audio/arts/Makefile index fc3c0a9585ee..57ee91a10f1b 100644 --- a/audio/arts/Makefile +++ b/audio/arts/Makefile @@ -28,7 +28,7 @@ PREFIX= ${KDE_PREFIX} WANT_GNOME= yes USE_QT_VER= 3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes QTCPPFLAGS+= -L${LOCALBASE}/lib diff --git a/audio/aube/Makefile b/audio/aube/Makefile index a8bc8e619eeb..144f919cf161 100644 --- a/audio/aube/Makefile +++ b/audio/aube/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile USE_GNOME= imlib USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/bmp-mac/Makefile b/audio/bmp-mac/Makefile index 1eff19e97f35..9a70d8676e4b 100644 --- a/audio/bmp-mac/Makefile +++ b/audio/bmp-mac/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player \ USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 CPPFLAGS+= "-I${LOCALBASE}/include" PLUGDIR= lib/bmp/Input PLUGFILE= lib${PKGNAMEPREFIX}${PORTNAME}.so diff --git a/audio/bmp-modplug/Makefile b/audio/bmp-modplug/Makefile index 56082790c742..8914a9b4cf46 100644 --- a/audio/bmp-modplug/Makefile +++ b/audio/bmp-modplug/Makefile @@ -23,7 +23,7 @@ COMMENT= A modplug-based plugin for beep-media-player LIB_DEPENDS?= beep.2:${PORTSDIR}/multimedia/beep-media-player LIB_DEPENDS+= modplug.0:${PORTSDIR}/audio/libmodplug -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes HAS_CONFIGURE= yes PLUGDIR?= lib/bmp/Input diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile index 23e874045fa9..ce2e9d84fc47 100644 --- a/audio/bmp-musepack/Makefile +++ b/audio/bmp-musepack/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes CPPFLAGS+= "-I${LOCALBASE}/include" GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 PLUGDIR= lib/bmp/Input PLUGFILE= libbmp-mpc.so PLIST_FILES= ${PLUGDIR}/${PLUGFILE} diff --git a/audio/bmp-wma/Makefile b/audio/bmp-wma/Makefile index ba168587bb82..556b95738a62 100644 --- a/audio/bmp-wma/Makefile +++ b/audio/bmp-wma/Makefile @@ -21,7 +21,7 @@ PLIST_FILES= lib/bmp/Input/libwma.so \ lib/bmp/Input/libwma.a GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.pre.mk> diff --git a/audio/ccaudio/Makefile b/audio/ccaudio/Makefile index 61fd65b9edcf..5879dc930253 100644 --- a/audio/ccaudio/Makefile +++ b/audio/ccaudio/Makefile @@ -16,7 +16,9 @@ COMMENT= C++ class framework for manipulating audio files LIB_DEPENDS= ccgnu2:${PORTSDIR}/devel/commoncpp -USE_AUTOTOOLS= libtool:15 +BROKEN= Does not build with libtool 2.2. + +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/ccaudio2/Makefile b/audio/ccaudio2/Makefile index c085ffff2518..3721afb41e02 100644 --- a/audio/ccaudio2/Makefile +++ b/audio/ccaudio2/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= ccgnu2:${PORTSDIR}/devel/commoncpp CONFLICTS= ccaudio-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget gnomehack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/ccaudio2/pkg-plist b/audio/ccaudio2/pkg-plist index 06cc6633cde2..60c4730c9c3d 100644 --- a/audio/ccaudio2/pkg-plist +++ b/audio/ccaudio2/pkg-plist @@ -1,13 +1,10 @@ bin/audiotool bin/tonetool include/cc++/audio2.h -lib/ccaudio2-%%CCVERSION%%/adpcm.a lib/ccaudio2-%%CCVERSION%%/adpcm.la lib/ccaudio2-%%CCVERSION%%/adpcm.so -lib/ccaudio2-%%CCVERSION%%/g711.a lib/ccaudio2-%%CCVERSION%%/g711.la lib/ccaudio2-%%CCVERSION%%/g711.so -lib/ccaudio2-%%CCVERSION%%/oki.a lib/ccaudio2-%%CCVERSION%%/oki.la lib/ccaudio2-%%CCVERSION%%/oki.so lib/libccaudio2-%%CCVERSION%%.so @@ -18,4 +15,3 @@ lib/libccaudio2.so libdata/pkgconfig/libccaudio2.pc @dirrmtry include/cc++ @dirrm lib/ccaudio2-%%CCVERSION%% - diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile index 89bf18d9f5a9..3bad75893c48 100644 --- a/audio/dvda-author/Makefile +++ b/audio/dvda-author/Makefile @@ -7,7 +7,7 @@ PORTNAME= dvda-author PORTVERSION= 09.05 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 43e575039e84..07a9e3432358 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -17,7 +17,7 @@ COMMENT= A sound library for enlightenment package LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnometarget gnomehack USE_LDCONFIG= yes diff --git a/audio/faac/Makefile b/audio/faac/Makefile index 2ad076885ae5..e3ea1329eecb 100644 --- a/audio/faac/Makefile +++ b/audio/faac/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_DOS2UNIX= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/audio/faad/Makefile b/audio/faad/Makefile index 7883179ce2df..223bd5636c6e 100644 --- a/audio/faad/Makefile +++ b/audio/faad/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_DOS2UNIX= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile index f9431f3bbdc2..36892fd4fe32 100644 --- a/audio/festalon/Makefile +++ b/audio/festalon/Makefile @@ -18,7 +18,7 @@ COMMENT?= A command line player for .nsf and .hes audio files LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes MAKE_JOBS_SAFE= yes diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 41910b4ff8b1..d8d1ec7c4d5e 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -17,7 +17,7 @@ COMMENT= Free lossless audio codec LIB_DEPENDS= ogg.6:${PORTSDIR}/audio/libogg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-sse \ --with-ogg="${LOCALBASE}" \ diff --git a/audio/freealut/Makefile b/audio/freealut/Makefile index 3bbee5e91335..951e56c88fec 100644 --- a/audio/freealut/Makefile +++ b/audio/freealut/Makefile @@ -16,7 +16,7 @@ COMMENT= The OpenAL Utility Toolkit LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/audio/glame/Makefile b/audio/glame/Makefile index cbfa93813971..226ebbdd47c5 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -7,7 +7,7 @@ PORTNAME= glame PORTVERSION= 2.0.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= audio gnome MASTER_SITES= SF @@ -24,7 +24,7 @@ USE_XORG= xbitmaps x11 USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ MAKEINFO="makeinfo --no-split" diff --git a/audio/gnomoradio/Makefile b/audio/gnomoradio/Makefile index f59ec7eca642..a0ffe6b0c3e8 100644 --- a/audio/gnomoradio/Makefile +++ b/audio/gnomoradio/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ ao:${PORTSDIR}/audio/libao USE_GNOME= gnomehack gnomeprefix -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LIBTOOLFLAGS= --tag=CXX CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index acac2bc28daf..ba73c487da10 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS+= mpg123:${PORTSDIR}/audio/mpg123 USE_GNOME= gdkpixbuf WANT_GNOME= yes -USE_AUTOTOOLS= autoconf:213 libtool:15 +USE_AUTOTOOLS= autoconf:213 libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/audio/grip/Makefile b/audio/grip/Makefile index 03b7433128e4..ef5013ea882f 100644 --- a/audio/grip/Makefile +++ b/audio/grip/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 USE_GNOME= gnomehack gnomeprefix gnometarget libgnomeui vte USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/gstreamer-plugins-moodbar/Makefile b/audio/gstreamer-plugins-moodbar/Makefile index 518b63071dbc..30ebc496beb2 100644 --- a/audio/gstreamer-plugins-moodbar/Makefile +++ b/audio/gstreamer-plugins-moodbar/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ CFLAGS:= ${CFLAGS} -O2 USE_GSTREAMER= yes good USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes OPTIONS= MP3 "mp3 files support" on \ diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile index 94836e2eead2..63dc4078538f 100644 --- a/audio/id3lib/Makefile +++ b/audio/id3lib/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= kaeru@inigo-tech.com COMMENT= Library for manipulating ID3v1/v1.1 and ID3v2 tags -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/audio/juk/Makefile b/audio/juk/Makefile index 951f22db8d3e..ad9dd2483665 100644 --- a/audio/juk/Makefile +++ b/audio/juk/Makefile @@ -31,7 +31,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} USE_LDCONFIG= yes diff --git a/audio/k3bmonkeyaudioplugin/Makefile b/audio/k3bmonkeyaudioplugin/Makefile index bd831df3a7c5..35350635d454 100644 --- a/audio/k3bmonkeyaudioplugin/Makefile +++ b/audio/k3bmonkeyaudioplugin/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= k3b:${PORTSDIR}/sysutils/k3b USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= ${PREFIX}/lib/kde3 post-patch: diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index 9f11f9722df5..cd167bce7f5e 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/audio/kirocker/Makefile b/audio/kirocker/Makefile index d5f1a176acbc..e9c4b6743f2a 100644 --- a/audio/kirocker/Makefile +++ b/audio/kirocker/Makefile @@ -20,7 +20,7 @@ COMMENT= Kicker applet for displaying Amarok info RUN_DEPENDS= amarok:${PORTSDIR}/audio/amarok GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER=3 INSTALLS_ICONS= yes diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 6d974e060b31..96ce92f653cf 100644 --- a/audio/lame/Makefile +++ b/audio/lame/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//:S/./-/} MAINTAINER= netchild@FreeBSD.org COMMENT= Fast MP3 encoder kit -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index 5d6c6c94a470..35333db2ebfb 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -15,7 +15,7 @@ DISTNAME= a52dec-${PORTVERSION:S/.b/b/} MAINTAINER= multimedia@FreeBSD.org COMMENT= A free library for decoding ATSC A/52 streams, aka AC-3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes diff --git a/audio/libadplug/Makefile b/audio/libadplug/Makefile index 9cdcfb651731..fd7b6c6c2603 100644 --- a/audio/libadplug/Makefile +++ b/audio/libadplug/Makefile @@ -17,7 +17,7 @@ COMMENT= AdLib emulator library supporting many formats LIB_DEPENDS= binio.1:${PORTSDIR}/devel/libbinio -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= pkgconfig diff --git a/audio/libamrnb/Makefile b/audio/libamrnb/Makefile index 7639b7e2c67a..80bafaadfeb0 100644 --- a/audio/libamrnb/Makefile +++ b/audio/libamrnb/Makefile @@ -24,7 +24,7 @@ RESTRICTED= license prohibits redistribution RESTRICTED_FILES= ${SRC3GPP} USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt SUB_FILES= pkg-message GNU_CONFIGURE= yes diff --git a/audio/libamrwb/Makefile b/audio/libamrwb/Makefile index a51daefd71dc..ec3d13202b69 100644 --- a/audio/libamrwb/Makefile +++ b/audio/libamrwb/Makefile @@ -23,7 +23,7 @@ RESTRICTED= license prohibits redistribution RESTRICTED_FILES= ${SRC3GPP} USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PORTDOCS= AUTHORS COPYING ChangeLog NEWS README TODO readme.txt SUB_FILES= pkg-message GNU_CONFIGURE= yes diff --git a/audio/libao/Makefile b/audio/libao/Makefile index fb26dd1d4bd9..e90efdfe5701 100644 --- a/audio/libao/Makefile +++ b/audio/libao/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ao/ MAINTAINER= naddy@FreeBSD.org COMMENT= Portable audio output library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WANT_GNOME= yes USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index 1d640eee7002..54a458904fd3 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -16,7 +16,7 @@ DISTNAME= audiofile-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A sound library for SGI audio file -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 13a1d9f532c7..827f9b310a47 100644 --- a/audio/libcanberra/Makefile +++ b/audio/libcanberra/Makefile @@ -7,7 +7,7 @@ PORTNAME= libcanberra PORTVERSION= 0.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio devel MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/ @@ -19,7 +19,7 @@ LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 CONFIGURE_ARGS= --disable-lynx CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile index 879742516dde..cf1ae1d21e42 100644 --- a/audio/libcdaudio/Makefile +++ b/audio/libcdaudio/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= novel@FreeBSD.org COMMENT= A library for playing audio CDs -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/libdssialsacompat/Makefile b/audio/libdssialsacompat/Makefile index c369b4f835be..3c7f1b4620c8 100644 --- a/audio/libdssialsacompat/Makefile +++ b/audio/libdssialsacompat/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.smbolton.com/linux/ MAINTAINER= freebsd-ports@coreland.ath.cx COMMENT= Alsa compatibility library to build DSSI -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile index 3f0a9374f533..07f1002dad51 100644 --- a/audio/libmad/Makefile +++ b/audio/libmad/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= mad MAINTAINER= dinoex@FreeBSD.org COMMENT= Libmad library (part of MAD project) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile index f1f55bbdcf50..30b5362121eb 100644 --- a/audio/libmikmod/Makefile +++ b/audio/libmikmod/Makefile @@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= david@trucs.org COMMENT= MikMod Sound Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WANT_GNOME= yes USE_GNOME= gnometarget lthack USE_GMAKE= yes diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile index 6bb0c059e229..559d811beb1d 100644 --- a/audio/libmp3splt/Makefile +++ b/audio/libmp3splt/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmp3splt PORTVERSION= 0.5.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mp3splt diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile index 93fbc74f5128..27f6a13f5547 100644 --- a/audio/libmpd/Makefile +++ b/audio/libmpd/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ MAINTAINER= miwi@FreeBSD.org COMMENT= Abstraction around libmpdclient -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= pkgconfig glib20 gnomehack USE_LDCONFIG= yes diff --git a/audio/libnjb/Makefile b/audio/libnjb/Makefile index 8c0f3fcd1832..048b9659e042 100644 --- a/audio/libnjb/Makefile +++ b/audio/libnjb/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= C library, API for communicating with Creative and Dell audio players -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/libnoise/Makefile b/audio/libnoise/Makefile index 100b433462cb..16c18e63cf20 100644 --- a/audio/libnoise/Makefile +++ b/audio/libnoise/Makefile @@ -14,19 +14,26 @@ DISTNAME= ${PORTNAME}src-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Generates three-dimensional coherent noise -BUILD_DEPENDS= libtool:${PORTSDIR}/devel/libtool15 - USE_ZIP= yes USE_GMAKE= yes +USE_AUTOTOOLS= libtool:22:env USE_LDCONFIG= yes CXXFLAGS+= -O3 -fomit-frame-pointer WRKSRC= ${WRKDIR}/noise +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/src/Makefile + @${REINPLACE_CMD} -e 's|include lib:|include:|g' \ + ${WRKSRC}/Makefile + do-install: - @${CP} -R ${WRKSRC}/lib/${PORTNAME}.* ${PREFIX}/lib/ + @${CP} -R ${WRKSRC}/src/${PORTNAME}.* ${PREFIX}/lib/ + @${CP} -R ${WRKSRC}/src/.libs/${PORTNAME}.so.* ${PREFIX}/lib/ @${INSTALL} -d ${PREFIX}/include/noise @${CP} -R ${WRKSRC}/include/ ${PREFIX}/include/noise/ @${RM} -f ${PREFIX}/include/noise/Makefile - @${LN} -sf ${PREFIX}/lib/libnoise.so.0.3 ${PREFIX}/lib/libnoise.so.0 +# This line is here to preserve the old behavior of the port. + @${LN} -sf ${PREFIX}/lib/libnoise.so.0 ${PREFIX}/lib/libnoise.so.0.3 .include <bsd.port.mk> diff --git a/audio/libnoise/files/patch-src_Makefile b/audio/libnoise/files/patch-src_Makefile new file mode 100644 index 000000000000..6bf567fbb7d4 --- /dev/null +++ b/audio/libnoise/files/patch-src_Makefile @@ -0,0 +1,19 @@ +--- src/Makefile.orig 2004-10-24 21:21:12.000000000 +0200 ++++ src/Makefile 2009-07-16 11:31:48.000000000 +0200 +@@ -12,12 +12,12 @@ +
+ # hooks for future makefiles being able to make multiple SOs, or older SOs
+ libnoise: libnoise.so libnoise.a libnoise.la
+-libnoise.so: libnoise.so.0
+-libnoise.so.0: libnoise.so.0.3
++#libnoise.so: libnoise.so.0
++#libnoise.so.0: libnoise.so.0.3
+
+ # Real build targets
+-libnoise.so.0.3: $(OBJECTS)
+- $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -Wl,-soname=libnoise.so.0 -o $@ $(OBJECTS:.o=.lo)
++libnoise: $(OBJECTS)
++ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -shared -o $@.la $(OBJECTS:.o=.lo) -rpath %%LOCALBASE%%/lib
+
+ libnoise.a: $(OBJECTS)
+ $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $(OBJECTS)
diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile index f1a38cd1cbf6..e43237fc02d4 100644 --- a/audio/libofa/Makefile +++ b/audio/libofa/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= fftw3.5:${PORTSDIR}/math/fftw3 \ expat.6:${PORTSDIR}/textproc/expat2 \ curl.5:${PORTSDIR}/ftp/curl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/audio/libogg/Makefile b/audio/libogg/Makefile index 9060625ef436..3e835ae80556 100644 --- a/audio/libogg/Makefile +++ b/audio/libogg/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://downloads.xiph.org/releases/ogg/ MAINTAINER= naddy@FreeBSD.org COMMENT= Ogg bitstream library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_LDCONFIG= yes diff --git a/audio/liboggz/Makefile b/audio/liboggz/Makefile index 70dc0735a15d..4c8b63290931 100644 --- a/audio/liboggz/Makefile +++ b/audio/liboggz/Makefile @@ -16,7 +16,7 @@ COMMENT= Simple Ogg API LIB_DEPENDS= ogg.6:${PORTSDIR}/audio/libogg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile index db8b88d930cf..0559b216bd99 100644 --- a/audio/libsamplerate/Makefile +++ b/audio/libsamplerate/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ fftw3.5:${PORTSDIR}/math/fftw3 USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-gcc-pipe diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile index 7b1e39fbeaa2..f49603f0e673 100644 --- a/audio/libshout/Makefile +++ b/audio/libshout/Makefile @@ -15,7 +15,7 @@ COMMENT= Connect and transmit data to an Icecast media streaming server CONFLICTS= libshout2-* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION} diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile index 9e4dcd3dec51..efdcc56daba7 100644 --- a/audio/libsidplay/Makefile +++ b/audio/libsidplay/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= sec@42.org COMMENT= A Commodore SID-chip emulator library to play SID music files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/audio/libsidplay2/Makefile b/audio/libsidplay2/Makefile index a1ede1c5cbd6..81bd7e03bf07 100644 --- a/audio/libsidplay2/Makefile +++ b/audio/libsidplay2/Makefile @@ -18,7 +18,7 @@ COMMENT= Library to play Commodore 64 SID-tunes cycle accurate USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= builders/hardsid-builder/configure \ builders/resid-builder/configure \ libsidplay/configure \ diff --git a/audio/libtremor/Makefile b/audio/libtremor/Makefile index 4cd8a0d84c75..4fc15c6f0a67 100644 --- a/audio/libtremor/Makefile +++ b/audio/libtremor/Makefile @@ -18,7 +18,7 @@ COMMENT= Integer-only fully Ogg Vorbis compliant decoder library SNAP_DATE= 02132004 WRKSRC= ${WRKDIR}/Tremor -USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/audio/libtunepimp-old/Makefile b/audio/libtunepimp-old/Makefile index 966db21f0060..45c0f45e039e 100644 --- a/audio/libtunepimp-old/Makefile +++ b/audio/libtunepimp-old/Makefile @@ -28,7 +28,7 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --libdir=${PREFIX}/lib/tunepimp-0.4 --includedir=${PREFIX}/include/tunepimp-0.4 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile index 7f6dd8f0aa4e..101938f798e9 100644 --- a/audio/libtunepimp/Makefile +++ b/audio/libtunepimp/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \ CONFLICTS= trm-0* USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -liconv" USE_LDCONFIG= yes diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 3af8a20e8955..b6eb372b09af 100644 --- a/audio/libvorbis/Makefile +++ b/audio/libvorbis/Makefile @@ -17,7 +17,7 @@ COMMENT= Audio compression codec library LIB_DEPENDS= ogg.6:${PORTSDIR}/audio/libogg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack CONFIGURE_ARGS= --with-ogg=${LOCALBASE} diff --git a/audio/mac/Makefile b/audio/mac/Makefile index c34954e9f4e2..cc0d7e2a5d5d 100644 --- a/audio/mac/Makefile +++ b/audio/mac/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-3.99-u4-b5 MAINTAINER= danfe@FreeBSD.org COMMENT= Monkey's Audio lossless codec -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static diff --git a/audio/mp3splt/Makefile b/audio/mp3splt/Makefile index 2a972edb0aa5..5b47a2e02acf 100644 --- a/audio/mp3splt/Makefile +++ b/audio/mp3splt/Makefile @@ -7,6 +7,7 @@ PORTNAME= mp3splt PORTVERSION= 2.2.3 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile index dfd78c5710f5..64c0b2cd5193 100644 --- a/audio/mpeglib_artsplug/Makefile +++ b/audio/mpeglib_artsplug/Makefile @@ -27,7 +27,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} USE_LDCONFIG= yes diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index 849531f3b961..4fef38ec302f 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -7,6 +7,7 @@ PORTNAME= mpg123 PORTVERSION= 1.6.4 +PORTREVISION= 1 CATEGORIES= audio ipv6 MASTER_SITES= SF \ http://www.mpg123.de/download/ diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile index 4b1bdff3f0f4..1a9c71fa86b3 100644 --- a/audio/mpiosh/Makefile +++ b/audio/mpiosh/Makefile @@ -7,6 +7,7 @@ PORTNAME= mpiosh PORTVERSION= 0.7.1.p2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= SF/mpio DISTNAME= mpio-${PORTVERSION:S|.p|_pre|} @@ -18,10 +19,11 @@ USE_ICONV= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing -CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -liconv" +CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -liconv" .include <bsd.port.pre.mk> @@ -31,16 +33,6 @@ LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in .endif -patch-autotools: - ${DO_NADA} - -# -# Get rid of .la and static library files -# -post-configure: - @${REINPLACE_CMD} -E -e \ - '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool - post-patch: .if ${OSVERSION} >= 800069 ${RM} -f ${WRKSRC}/configure diff --git a/audio/mpiosh/pkg-plist b/audio/mpiosh/pkg-plist index 7531bd270a5e..8263c7ef5f4f 100644 --- a/audio/mpiosh/pkg-plist +++ b/audio/mpiosh/pkg-plist @@ -1,9 +1,11 @@ bin/mpiologo bin/mpiosh etc/mpio/mpioshrc -lib/libmpio.so -lib/libmpio.so.1 include/mpio/defs.h include/mpio/mpio.h +lib/libmpio.a +lib/libmpio.la +lib/libmpio.so +lib/libmpio.so.1 @dirrm include/mpio @dirrm etc/mpio diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile index 62d12adddefa..d9bb651939f0 100644 --- a/audio/ncmpcpp/Makefile +++ b/audio/ncmpcpp/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_ICONV= yes USE_GNOME= glib20 -USE_AUTOTOOLS= automake:110 aclocal:110 libtool:15 +USE_AUTOTOOLS= automake:110 aclocal:110 libtool:22 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lpthread" diff --git a/audio/openal/Makefile b/audio/openal/Makefile index 849f012a94d5..03f4e785f2b1 100644 --- a/audio/openal/Makefile +++ b/audio/openal/Makefile @@ -17,7 +17,7 @@ COMMENT= A 3D positional spatialized sound library CONFLICTS= openal-soft-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-capture diff --git a/audio/openspc/Makefile b/audio/openspc/Makefile index 48ddd8d5f19e..14fdd929b226 100644 --- a/audio/openspc/Makefile +++ b/audio/openspc/Makefile @@ -18,7 +18,7 @@ COMMENT= A command line player for .spc and .zst files ONLY_FOR_ARCHS= i386 # contains x86 asm code USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_JOBS_SAFE= yes PORTDOCS= README diff --git a/audio/pocketsphinx/Makefile b/audio/pocketsphinx/Makefile index a73994f9619a..1e634213e85d 100644 --- a/audio/pocketsphinx/Makefile +++ b/audio/pocketsphinx/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= sphinxfe.0:${PORTSDIR}/audio/sphinxbase USE_LDCONFIG= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 7471af1e22ee..6064209564c2 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.2 2009/04/18 19:59:03 marcus Exp $ +# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.5 2009/07/20 21:26:40 marcus Exp $ # PORTNAME= pulseaudio -PORTVERSION= 0.9.14 -PORTREVISION= 7 +PORTVERSION= 0.9.15 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/ @@ -19,20 +19,23 @@ LIB_DEPENDS= samplerate.1:${PORTSDIR}/audio/libsamplerate \ oil-0.3.0:${PORTSDIR}/devel/liboil \ speexdsp.1:${PORTSDIR}/audio/speex \ dbus-1.3:${PORTSDIR}/devel/dbus \ - gdbm.3:${PORTSDIR}/databases/gdbm + gdbm.3:${PORTSDIR}/databases/gdbm \ + execinfo:${PORTSDIR}/devel/libexecinfo USE_GNOME= gnometarget gnomehack glib20 intltool ltverhack -USE_XORG= x11 sm +USE_XORG= x11 sm xtst ice USE_LDCONFIG= yes USE_GETTEXT= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 USE_GMAKE= yes MAKE_JOBS_UNSAFE=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ + OPENSSL_CFLAGS="-I/usr/include" \ + OPENSSL_LIBS="-lcrypto -lssl" \ LIBS="-lm -lintl" CONFIGURE_ARGS= --localstatedir=/var \ @@ -43,7 +46,7 @@ OPTIONS= JACK "JACK audio support" Off \ HAL "Enable HAL support" On \ GCONF "Enable GConf support" On -PULSE_VERSION= ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +PULSE_VERSION= ${PORTVERSION} PLIST_SUB= PULSE_VERSION=${PULSE_VERSION} MAN1= esdcompat.1 pabrowse.1 pacat.1 pacmd.1 pactl.1 padsp.1 \ diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 5594f9d76c7b..3a94651289a0 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,3 +1,3 @@ -MD5 (pulseaudio-0.9.14.tar.gz) = 0ed1115222d1d8c64cc14961cccb2eb0 -SHA256 (pulseaudio-0.9.14.tar.gz) = e6129f9239235981d329de40eeffa55041e6815a93aaa994d1eae242ea7446b5 -SIZE (pulseaudio-0.9.14.tar.gz) = 1303077 +MD5 (pulseaudio-0.9.15.tar.gz) = 4510364eeab219fd100bd1b373b1a002 +SHA256 (pulseaudio-0.9.15.tar.gz) = 1e8ad5b7c5cf3485bd0738c296274ff2c99d26d12a25a225dc250eddea25b9f1 +SIZE (pulseaudio-0.9.15.tar.gz) = 1704374 diff --git a/audio/pulseaudio/files/patch-src_Makefile.in b/audio/pulseaudio/files/patch-src_Makefile.in new file mode 100644 index 000000000000..0be2eaa8c063 --- /dev/null +++ b/audio/pulseaudio/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2009-07-19 14:49:35.000000000 -0400 ++++ src/Makefile.in 2009-07-19 14:56:39.000000000 -0400 +@@ -2668,7 +2668,7 @@ libpulsecommon_@PA_MAJORMINORMICRO@_la_C + libpulsecommon_@PA_MAJORMINORMICRO@_la_LDFLAGS = $(AM_LDFLAGS) \ + -avoid-version $(am__append_17) + libpulsecommon_@PA_MAJORMINORMICRO@_la_LIBADD = $(AM_LIBADD) \ +- $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) $(am__append_19) \ ++ $(LIBWRAP_LIBS) $(WINSOCK_LIBS) $(LTLIBICONV) -lexecinfo $(am__append_19) \ + $(am__append_23) + + ################################### diff --git a/audio/pulseaudio/files/patch-src_daemon_default.pa.in b/audio/pulseaudio/files/patch-src_daemon_default.pa.in index 77ba7306a63c..b8291f56dda2 100644 --- a/audio/pulseaudio/files/patch-src_daemon_default.pa.in +++ b/audio/pulseaudio/files/patch-src_daemon_default.pa.in @@ -1,5 +1,5 @@ ---- src/daemon/default.pa.in.orig 2008-08-19 17:25:03.000000000 -0400 -+++ src/daemon/default.pa.in 2008-09-28 19:48:14.000000000 -0400 +--- src/daemon/default.pa.in.orig 2009-07-19 14:58:14.000000000 -0400 ++++ src/daemon/default.pa.in 2009-07-19 14:58:41.000000000 -0400 @@ -22,10 +22,10 @@ .nofail @@ -15,3 +15,12 @@ .fail +@@ -101,7 +101,7 @@ load-module module-rescue-streams + load-module module-always-sink + + ### Automatically suspend sinks/sources that become idle for too long +-load-module module-suspend-on-idle ++#load-module module-suspend-on-idle + + ### If autoexit on idle is enabled we want to make sure we only quit + ### when no local session needs us anymore. diff --git a/audio/pulseaudio/files/patch-src_modules_module-oss.c b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c index 97cf10e4dde1..a723999af7fd 100644 --- a/audio/pulseaudio/files/patch-src_modules_module-oss.c +++ b/audio/pulseaudio/files/patch-src_modules_oss_module-oss.c @@ -1,21 +1,21 @@ ---- src/modules/module-oss.c.orig 2009-07-10 02:51:21.000000000 -0400 -+++ src/modules/module-oss.c 2009-07-10 02:52:05.000000000 -0400 -@@ -1204,10 +1204,12 @@ int pa__init(pa_module*m) { - use_mmap = 0; +--- src/modules/oss/module-oss.c.orig 2009-04-13 17:11:32.000000000 -0400 ++++ src/modules/oss/module-oss.c 2009-07-19 14:24:25.000000000 -0400 +@@ -1214,10 +1214,12 @@ int pa__init(pa_module*m) { + use_mmap = FALSE; } +#ifndef __FreeBSD__ if (use_mmap && mode == O_WRONLY) { pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); - use_mmap = 0; + use_mmap = FALSE; } +#endif if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) pa_log_info("Hardware name is '%s'.", hwdesc); -@@ -1385,7 +1387,7 @@ int pa__init(pa_module*m) { +@@ -1399,7 +1401,7 @@ int pa__init(pa_module*m) { + if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { pa_bool_t do_close = TRUE; - u->mixer_devmask = 0; - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) + if (ioctl(u->mixer_fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) diff --git a/audio/pulseaudio/files/patch-src_modules_oss-util.c b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c index bf44d4fdd729..5fe7ec3294d1 100644 --- a/audio/pulseaudio/files/patch-src_modules_oss-util.c +++ b/audio/pulseaudio/files/patch-src_modules_oss_oss-util.c @@ -1,5 +1,5 @@ ---- src/modules/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500 -+++ src/modules/oss-util.c 2008-01-09 17:00:45.000000000 -0500 +--- src/modules/oss/oss-util.c.orig 2007-11-08 21:45:25.000000000 -0500 ++++ src/modules/oss/oss-util.c 2008-01-09 17:00:45.000000000 -0500 @@ -44,6 +44,22 @@ #include "oss-util.h" @@ -23,15 +23,3 @@ int pa_oss_open(const char *device, int *mode, int* pcaps) { int fd = -1; int caps; -@@ -300,7 +316,11 @@ static int get_device_number(const char - int r; - - if (!(p = rp = pa_readlink(dev))) { -+#ifdef ENOLINK - if (errno != EINVAL && errno != ENOLINK) { -+#else -+ if (errno != EINVAL) { -+#endif - r = -1; - goto finish; - } diff --git a/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c new file mode 100644 index 000000000000..2dbcad26ab0d --- /dev/null +++ b/audio/pulseaudio/files/patch-src_modules_rtp_rtsp_client.c @@ -0,0 +1,12 @@ +--- src/modules/rtp/rtsp_client.c.orig 2009-07-19 14:38:38.000000000 -0400 ++++ src/modules/rtp/rtsp_client.c 2009-07-19 14:39:46.000000000 -0400 +@@ -23,6 +23,9 @@ + #include <config.h> + #endif + ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <netinet/in.h> + #include <fcntl.h> + #include <stdlib.h> + #include <string.h> diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c deleted file mode 100644 index c8d657481d62..000000000000 --- a/audio/pulseaudio/files/patch-src_tests_rtstutter.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tests/rtstutter.c.orig 2008-07-26 17:10:17.000000000 -0400 -+++ src/tests/rtstutter.c 2008-07-26 17:12:26.000000000 -0400 -@@ -42,6 +42,7 @@ static int msec_lower, msec_upper; - static void* work(void *p) PA_GCC_NORETURN; - - static void* work(void *p) { -+#ifndef __FreeBSD__ - cpu_set_t mask; - struct sched_param param; - -@@ -83,6 +84,7 @@ static void* work(void *p) { - } while (now.tv_sec < end.tv_sec || - (now.tv_sec == end.tv_sec && now.tv_nsec < end.tv_nsec)); - } -+#endif - } - - int main(int argc, char*argv[]) { diff --git a/audio/pulseaudio/files/patch-ubuntu-bundle b/audio/pulseaudio/files/patch-ubuntu-bundle index 34e0819b97f1..65df94565aef 100644 --- a/audio/pulseaudio/files/patch-ubuntu-bundle +++ b/audio/pulseaudio/files/patch-ubuntu-bundle @@ -1,1668 +1,893 @@ -From 121bfc9f1916395e5216927ec3a9e0bbd742395a Mon Sep 17 00:00:00 2001 -From: Sjoerd Simons <sjoerd@debian.org> -Date: Sun, 19 Oct 2008 13:39:50 +0100 -Subject: [PATCH] load module gconf earlier +From 876624e3147cf3deac847b11bde4b04988971eee Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Sun, 19 Apr 2009 19:02:16 +0200 +Subject: [PATCH 02/28] util: if NULL is passed to pa_path_get_filename() just hand it through --- - src/daemon/default.pa.in | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) + src/pulse/util.c | 3 ++- + src/pulse/util.h | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in -index 7032038..41322c6 100755 ---- src/daemon/default.pa.in -+++ src/daemon/default.pa.in -@@ -72,6 +72,16 @@ load-module module-native-protocol-unix - #load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 description="RTP Multicast Sink" - #load-module module-rtp-send source=rtp.monitor - -+### Load additional modules from GConf settings. This can be configured with the paprefs tool. -+### Please keep in mind that the modules configured by paprefs might conflict with manually -+### loaded modules. -+.ifexists module-gconf@PA_SOEXT@ -+.nofail -+load-module module-gconf -+.fail -+.endif -+ -+ - ### Automatically restore the volume of streams and devices - load-module module-stream-restore - load-module module-device-restore -@@ -96,15 +106,6 @@ load-module module-console-kit - ### Enable positioned event sounds - load-module module-position-event-sounds - --### Load additional modules from GConf settings. This can be configured with the paprefs tool. --### Please keep in mind that the modules configured by paprefs might conflict with manually --### loaded modules. --.ifexists module-gconf@PA_SOEXT@ --.nofail --load-module module-gconf --.fail --.endif -- - # X11 modules should not be started from default.pa so that one daemon - # can be shared by multiple sessions. - -Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in -=================================================================== ---- src/daemon/daemon.conf.in 2009-03-07 05:01:11.000000000 -0500 -+++ src/daemon/daemon.conf.in 2009-03-07 05:01:54.000000000 -0500 -@@ -46,7 +46,7 @@ - ; log-target = auto - ; log-level = notice - --; resample-method = speex-float-3 -+resample-method = src-linear - ; disable-remixing = no - ; disable-lfe-remixing = yes - -@@ -72,5 +72,5 @@ - ; default-sample-rate = 44100 - ; default-sample-channels = 2 - --; default-fragments = 4 --; default-fragment-size-msec = 25 -+default-fragments = 8 -+default-fragment-size-msec = 10 -Index: pulseaudio-0.9.13/src/daemon/default.pa.in -=================================================================== ---- src/daemon/default.pa.in 2009-01-06 22:58:47.000000000 -0500 -+++ src/daemon/default.pa.in 2009-01-06 22:59:15.000000000 -0500 -@@ -29,6 +29,9 @@ - - .fail +diff --git src/pulse/util.c src/pulse/util.c +index 54a188d..6f1e40a 100644 +--- src/pulse/util.c ++++ src/pulse/util.c +@@ -219,7 +219,8 @@ char *pa_get_binary_name(char *s, size_t l) { + char *pa_path_get_filename(const char *p) { + char *fn; + +- pa_assert(p); ++ if (!p) ++ return NULL; + + if ((fn = strrchr(p, PA_PATH_SEP_CHAR))) + return fn+1; +diff --git src/pulse/util.h src/pulse/util.h +index f6dd40c..ad85653 100644 +--- src/pulse/util.h ++++ src/pulse/util.h +@@ -51,7 +51,7 @@ char *pa_get_home_dir(char *s, size_t l); + char *pa_get_binary_name(char *s, size_t l); + + /** Return a pointer to the filename inside a path (which is the last +- * component). */ ++ * component). If passed NULL will return NULL. */ + char *pa_path_get_filename(const char *p); + + /** Wait t milliseconds */ +From 7f17882bae9d2b694f440d28dc9bb3fcf133fa1a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 1 May 2009 04:13:15 +0200 +Subject: [PATCH 08/28] endian: fix LE/BE order for 24 bit accessor functions + +--- + src/pulsecore/endianmacros.h | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git src/pulsecore/endianmacros.h src/pulsecore/endianmacros.h +index 2257937..2b18cf8 100644 +--- src/pulsecore/endianmacros.h ++++ src/pulsecore/endianmacros.h +@@ -45,27 +45,27 @@ + #define PA_UINT32_SWAP(x) ( (uint32_t) ( ((uint32_t) (x) >> 24) | ((uint32_t) (x) << 24) | (((uint32_t) (x) & 0xFF00) << 8) | ((((uint32_t) (x)) >> 8) & 0xFF00) ) ) + #endif -+### Automatically suspend sinks/sources that become idle for too long -+load-module module-suspend-on-idle -+ - ### Automatically restore the volume of streams and devices - load-module module-stream-restore - load-module module-device-restore -@@ -95,9 +98,6 @@ - ### Make sure we always have a sink around, even if it is a null sink. - load-module module-always-sink - --### Automatically suspend sinks/sources that become idle for too long --load-module module-suspend-on-idle -- - ### If autoexit on idle is enabled we want to make sure we only quit - ### when no local session needs us anymore. - load-module module-console-kit -Index: pulseaudio-0.9.13/src/pulsecore/sink-input.c -=================================================================== ---- src/pulsecore/sink-input.c 2008-12-28 23:33:28.000000000 -0500 -+++ src/pulsecore/sink-input.c 2008-12-28 23:35:20.000000000 -0500 -@@ -292,8 +292,6 @@ - pa_assert_se(i->sink->n_corked -- >= 1); - else if (i->state != PA_SINK_INPUT_CORKED && state == PA_SINK_INPUT_CORKED) - i->sink->n_corked++; -- -- pa_sink_update_status(i->sink); +-static inline uint32_t PA_READ24LE(const uint8_t *p) { ++static inline uint32_t PA_READ24BE(const uint8_t *p) { + return + ((uint32_t) p[0] << 16) | + ((uint32_t) p[1] << 8) | + ((uint32_t) p[2]); } - /* Called from main context */ -@@ -331,6 +329,8 @@ - pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_STATE_CHANGED], ssync); - } - -+ pa_sink_update_status(i->sink); -+ - return 0; +-static inline uint32_t PA_READ24BE(const uint8_t *p) { ++static inline uint32_t PA_READ24LE(const uint8_t *p) { + return + ((uint32_t) p[2] << 16) | + ((uint32_t) p[1] << 8) | + ((uint32_t) p[0]); } -@@ -381,6 +381,8 @@ - pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_UNLINK_POST], i); - } - -+ pa_sink_update_status(i->sink); -+ - i->sink = NULL; - pa_sink_input_unref(i); +-static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) { ++static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) { + p[0] = (uint8_t) (u >> 16); + p[1] = (uint8_t) (u >> 8); + p[2] = (uint8_t) u; } -@@ -442,6 +444,8 @@ - pa_subscription_post(i->sink->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW, i->index); - pa_hook_fire(&i->sink->core->hooks[PA_CORE_HOOK_SINK_INPUT_PUT], i); -+ -+ pa_sink_update_status(i->sink); +-static inline void PA_WRITE24BE(uint8_t *p, uint32_t u) { ++static inline void PA_WRITE24LE(uint8_t *p, uint32_t u) { + p[2] = (uint8_t) (u >> 16); + p[1] = (uint8_t) (u >> 8); + p[0] = (uint8_t) u; +From 11c17636d1d6c7eb4d6278869d3fa91715433ab2 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Sun, 19 Apr 2009 19:04:50 +0200 +Subject: [PATCH 09/28] log: print file name only when we have it + +--- + src/pulsecore/log.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git src/pulsecore/log.c src/pulsecore/log.c +index 60ea9c5..919ebe1 100644 +--- src/pulsecore/log.c ++++ src/pulsecore/log.c +@@ -285,7 +285,7 @@ void pa_log_levelv_meta( + + if ((_flags & PA_LOG_PRINT_META) && file && line > 0 && func) + pa_snprintf(location, sizeof(location), "[%s:%i %s()] ", file, line, func); +- else if (_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE)) ++ else if ((_flags & (PA_LOG_PRINT_META|PA_LOG_PRINT_FILE)) && file) + pa_snprintf(location, sizeof(location), "%s: ", pa_path_get_filename(file)); + else + location[0] = 0; +From 977f59368ba55fac3fe21d7549bc0552daf07d91 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 21 Apr 2009 21:24:33 +0200 +Subject: [PATCH 13/28] mutex: when we fail to fill in mutex into static mutex ptr free it again + +--- + src/pulsecore/mutex-posix.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git src/pulsecore/mutex-posix.c src/pulsecore/mutex-posix.c +index b3e5256..0ff4bee 100644 +--- src/pulsecore/mutex-posix.c ++++ src/pulsecore/mutex-posix.c +@@ -153,6 +153,8 @@ pa_mutex* pa_static_mutex_get(pa_static_mutex *s, pa_bool_t recursive, pa_bool_t + if ((pa_atomic_ptr_cmpxchg(&s->ptr, NULL, m))) + return m; + ++ pa_mutex_free(m); ++ + /* Him, filling in failed, so someone else must have filled in + * already */ + pa_assert_se(m = pa_atomic_ptr_load(&s->ptr)); +From 776b0817f79b475c9725b53c185484b5e3ff6fbb Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Tue, 26 May 2009 22:30:36 +0200 +Subject: [PATCH 14/28] oss: don't deadlock when we try to resume an OSS device that lacks a mixer + +--- + src/modules/oss/module-oss.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git src/modules/oss/module-oss.c src/modules/oss/module-oss.c +index 9f7863f..aa5f918 100644 +--- src/modules/oss/module-oss.c ++++ src/modules/oss/module-oss.c +@@ -477,6 +477,7 @@ static void build_pollfd(struct userdata *u) { + pollfd->revents = 0; } - /* Called from main context */ -Index: pulseaudio-0.9.13/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2008-12-28 23:35:05.000000000 -0500 -+++ src/pulsecore/sink.c 2008-12-28 23:35:20.000000000 -0500 -@@ -990,7 +990,9 @@ - unsigned ret; ++/* Called from IO context */ + static int suspend(struct userdata *u) { + pa_assert(u); + pa_assert(u->fd >= 0); +@@ -526,6 +527,7 @@ static int suspend(struct userdata *u) { + return 0; + } - pa_sink_assert_ref(s); -- pa_assert(PA_SINK_IS_LINKED(s->state)); -+ -+ if (!PA_SINK_IS_LINKED(s->state)) -+ return 0; ++/* Called from IO context */ + static int unsuspend(struct userdata *u) { + int m; + pa_sample_spec ss, *ss_original; +@@ -616,10 +618,10 @@ static int unsuspend(struct userdata *u) { - ret = pa_idxset_size(s->inputs); - pa_assert(ret >= s->n_corked); -Index: pulseaudio-0.9.13/src/pulsecore/source-output.c -=================================================================== ---- src/pulsecore/source-output.c 2008-12-28 23:35:05.000000000 -0500 -+++ src/pulsecore/source-output.c 2008-12-28 23:35:20.000000000 -0500 -@@ -246,7 +246,6 @@ - else if (o->state != PA_SOURCE_OUTPUT_CORKED && state == PA_SOURCE_OUTPUT_CORKED) - o->source->n_corked++; + build_pollfd(u); -- pa_source_update_status(o->source); - } +- if (u->sink) +- pa_sink_get_volume(u->sink, TRUE, FALSE); +- if (u->source) +- pa_source_get_volume(u->source, TRUE); ++ if (u->sink && u->sink->get_volume) ++ u->sink->get_volume(u->sink); ++ if (u->source && u->source->get_volume) ++ u->source->get_volume(u->source); - /* Called from main context */ -@@ -264,6 +263,8 @@ - if (state != PA_SOURCE_OUTPUT_UNLINKED) - pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_STATE_CHANGED], o); + pa_log_info("Resumed successfully..."); -+ pa_source_update_status(o->source); -+ - return 0; +@@ -631,6 +633,7 @@ fail: + return -1; } -@@ -302,6 +303,8 @@ - pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_UNLINK_POST], o); ++/* Called from IO context */ + static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { + struct userdata *u = PA_SINK(o)->userdata; + int ret; +From b8e05f113a44f46a91d3343e3e4a1eb15c98e1c9 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Wed, 29 Apr 2009 04:13:07 +0200 +Subject: [PATCH 15/28] simple-protocol: don't hit an assert when we call connection_unlink() early + +--- + src/pulsecore/protocol-simple.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git src/pulsecore/protocol-simple.c src/pulsecore/protocol-simple.c +index 44fe597..776d74b 100644 +--- src/pulsecore/protocol-simple.c ++++ src/pulsecore/protocol-simple.c +@@ -130,7 +130,7 @@ static void connection_unlink(connection *c) { + c->io = NULL; } -+ pa_source_update_status(o->source); -+ - o->source = NULL; - pa_source_output_unref(o); +- pa_assert_se(pa_idxset_remove_by_data(c->protocol->connections, c, NULL) == c); ++ pa_idxset_remove_by_data(c->protocol->connections, c, NULL); + c->protocol = NULL; + connection_unref(c); } -@@ -353,6 +356,8 @@ +From bee02ee03fc82f447a358a564a4d922c0f29cfcf Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Wed, 29 Apr 2009 01:46:12 +0200 +Subject: [PATCH 16/28] idxset: add enumeration macro PA_IDXSET_FOREACH + +--- + src/pulsecore/idxset.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git src/pulsecore/idxset.h src/pulsecore/idxset.h +index 7531ea3..6b9ff47 100644 +--- src/pulsecore/idxset.h ++++ src/pulsecore/idxset.h +@@ -103,4 +103,8 @@ unsigned pa_idxset_size(pa_idxset*s); + /* Return TRUE of the idxset is empty */ + pa_bool_t pa_idxset_isempty(pa_idxset *s); - pa_subscription_post(o->source->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_NEW, o->index); - pa_hook_fire(&o->source->core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_PUT], o); + -+ pa_source_update_status(o->source); - } - - /* Called from main context */ -Index: pulseaudio-0.9.13/src/pulsecore/source.c -=================================================================== ---- src/pulsecore/source.c 2008-12-28 23:35:05.000000000 -0500 -+++ src/pulsecore/source.c 2008-12-28 23:35:20.000000000 -0500 -@@ -637,7 +637,9 @@ - unsigned ret; - - pa_source_assert_ref(s); -- pa_assert(PA_SOURCE_IS_LINKED(s->state)); ++#define PA_IDXSET_FOREACH(e, s, idx) \ ++ for ((e) = pa_idxset_first((s), &(idx)); (e); (e) = pa_idxset_next((s), &(idx))) + -+ if (!PA_SOURCE_IS_LINKED(s->state)) -+ return 0; - - ret = pa_idxset_size(s->outputs); - pa_assert(ret >= s->n_corked); -Index: pulseaudio-0.9.13/src/pulsecore/sample-util.c -=================================================================== ---- src/pulsecore/sample-util.c 2009-01-03 18:30:13.000000000 -0500 -+++ src/pulsecore/sample-util.c 2009-01-03 18:30:30.000000000 -0500 -@@ -777,7 +777,7 @@ - return (l/fs) * fs; - } - --int pa_frame_aligned(size_t l, const pa_sample_spec *ss) { -+pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) { - size_t fs; - - pa_assert(ss); -Index: pulseaudio-0.9.13/src/pulsecore/sample-util.h -=================================================================== ---- src/pulsecore/sample-util.h 2009-01-03 18:30:13.000000000 -0500 -+++ src/pulsecore/sample-util.h 2009-01-03 18:30:30.000000000 -0500 -@@ -71,7 +71,7 @@ - - size_t pa_frame_align(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; - --int pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; -+pa_bool_t pa_frame_aligned(size_t l, const pa_sample_spec *ss) PA_GCC_PURE; - - void pa_interleave(const void *src[], unsigned channels, void *dst, size_t ss, unsigned n); - void pa_deinterleave(const void *src, void *dst[], unsigned channels, size_t ss, unsigned n); -Index: pulseaudio-0.9.13/src/pulsecore/once.c -=================================================================== ---- src/pulsecore/once.c 2009-01-03 18:47:32.000000000 -0500 -+++ src/pulsecore/once.c 2009-01-03 18:48:07.000000000 -0500 -@@ -28,13 +28,13 @@ - - #include "once.h" - --int pa_once_begin(pa_once *control) { -+pa_bool_t pa_once_begin(pa_once *control) { - pa_mutex *m; - - pa_assert(control); - - if (pa_atomic_load(&control->done)) -- return 0; -+ return FALSE; - - pa_atomic_inc(&control->ref); - -@@ -50,15 +50,17 @@ - * wait until it is unlocked */ - pa_mutex_lock(m); - -+ pa_assert(pa_atomic_load(&control->done)); -+ - pa_once_end(control); -- return 0; -+ return FALSE; - } - - pa_assert_se(m = pa_mutex_new(FALSE, FALSE)); - pa_mutex_lock(m); - - if (pa_atomic_ptr_cmpxchg(&control->mutex, NULL, m)) -- return 1; -+ return TRUE; - - pa_mutex_unlock(m); - pa_mutex_free(m); -@@ -91,4 +93,3 @@ - pa_once_end(control); - } - } -- -Index: pulseaudio-0.9.13/src/pulsecore/once.h -=================================================================== ---- src/pulsecore/once.h 2009-01-03 18:47:43.000000000 -0500 -+++ src/pulsecore/once.h 2009-01-03 18:48:07.000000000 -0500 -@@ -38,7 +38,7 @@ + #endif +From b7eff401100af0de381fba66293d21aca7ff36fa Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 17 Apr 2009 20:30:09 +0200 +Subject: [PATCH 17/28] rescue-streams: when one stream move fails try to continue with the remaining ones + +--- + src/modules/module-rescue-streams.c | 16 ++++++---------- + 1 files changed, 6 insertions(+), 10 deletions(-) + +diff --git src/modules/module-rescue-streams.c src/modules/module-rescue-streams.c +index 4f616e0..7c99a9b 100644 +--- src/modules/module-rescue-streams.c ++++ src/modules/module-rescue-streams.c +@@ -77,12 +77,10 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user } - /* Not to be called directly, use the macros defined below instead */ --int pa_once_begin(pa_once *o); -+pa_bool_t pa_once_begin(pa_once *o); - void pa_once_end(pa_once *o); - - #define PA_ONCE_BEGIN \ -Index: pulseaudio-0.9.13/src/pulsecore/protocol-native.c -=================================================================== ---- src/pulsecore/protocol-native.c 2009-01-15 17:25:43.000000000 -0500 -+++ src/pulsecore/protocol-native.c 2009-01-15 17:25:56.000000000 -0500 -@@ -3933,7 +3933,7 @@ + while ((i = pa_idxset_first(sink->inputs, NULL))) { +- if (pa_sink_input_move_to(i, target, FALSE) < 0) { ++ if (pa_sink_input_move_to(i, target, FALSE) < 0) + pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); +- return PA_HOOK_OK; +- } +- +- pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ else ++ pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); } - CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); -- CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); -+ CHECK_VALIDITY(c->pstream, !name || pa_namereg_is_valid_name(name) || *name == 0, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, idx == PA_INVALID_INDEX || !name, tag, PA_ERR_INVALID); - CHECK_VALIDITY(c->pstream, !name || idx == PA_INVALID_INDEX, tag, PA_ERR_INVALID); -@@ -3942,6 +3942,8 @@ - if (idx == PA_INVALID_INDEX && name && !*name) { +@@ -121,12 +119,10 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void + pa_assert(target != source); -+ pa_log_debug("%s all sinks", b ? "Suspending" : "Resuming"); -+ - if (pa_sink_suspend_all(c->protocol->core, b) < 0) { - pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); - return; -@@ -3967,6 +3969,8 @@ + while ((o = pa_idxset_first(source->outputs, NULL))) { +- if (pa_source_output_move_to(o, target, FALSE) < 0) { ++ if (pa_source_output_move_to(o, target, FALSE) < 0) + pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); +- return PA_HOOK_OK; +- } +- +- pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ else ++ pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); + } - if (idx == PA_INVALID_INDEX && name && !*name) { -+ pa_log_debug("%s all sources", b ? "Suspending" : "Resuming"); -+ - if (pa_source_suspend_all(c->protocol->core, b) < 0) { - pa_pstream_send_error(c->pstream, tag, PA_ERR_INVALID); - return; -Index: pulseaudio-0.9.14/src/pulsecore/asyncq.c -=================================================================== ---- src/pulsecore/asyncq.c 2009-01-31 15:19:57.000000000 -0500 -+++ src/pulsecore/asyncq.c 2009-01-31 15:20:05.000000000 -0500 -@@ -163,14 +163,14 @@ - return 0; +From 79510a3b15652b04bffbb798221d27e8d16f4ce2 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 1 May 2009 04:12:24 +0200 +Subject: [PATCH 18/28] sample: correctly pass s24-32 formats + +--- + src/pulse/sample.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git src/pulse/sample.c src/pulse/sample.c +index 1e67b03..ed7b1b0 100644 +--- src/pulse/sample.c ++++ src/pulse/sample.c +@@ -231,13 +231,13 @@ pa_sample_format_t pa_parse_sample_format(const char *format) { + else if (strcasecmp(format, "s24re") == 0) + return PA_SAMPLE_S24RE; + else if (strcasecmp(format, "s24-32le") == 0) +- return PA_SAMPLE_S24LE; ++ return PA_SAMPLE_S24_32LE; + else if (strcasecmp(format, "s24-32be") == 0) +- return PA_SAMPLE_S24BE; ++ return PA_SAMPLE_S24_32BE; + else if (strcasecmp(format, "s24-32ne") == 0 || strcasecmp(format, "s24-32") == 0) +- return PA_SAMPLE_S24NE; ++ return PA_SAMPLE_S24_32NE; + else if (strcasecmp(format, "s24-32re") == 0) +- return PA_SAMPLE_S24RE; ++ return PA_SAMPLE_S24_32RE; + + return -1; } +From 397f517aafda4efd00532ba7f19e7045aa853c2a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 1 May 2009 04:14:40 +0200 +Subject: [PATCH 19/28] sample-util: fix iteration loop when adjusting volume of s24 samples + +--- + src/pulsecore/sample-util.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c +index 3a9b384..a3e490b 100644 +--- src/pulsecore/sample-util.c ++++ src/pulsecore/sample-util.c +@@ -831,9 +831,9 @@ void pa_volume_memchunk( --static pa_bool_t flush_postq(pa_asyncq *l) { -+static pa_bool_t flush_postq(pa_asyncq *l, pa_bool_t wait) { - struct localq *q; - - pa_assert(l); - - while ((q = l->last_localq)) { - -- if (push(l, q->data, FALSE) < 0) -+ if (push(l, q->data, wait) < 0) - return FALSE; - - l->last_localq = q->prev; -@@ -187,7 +187,7 @@ - int pa_asyncq_push(pa_asyncq*l, void *p, pa_bool_t wait) { - pa_assert(l); - -- if (!flush_postq(l)) -+ if (!flush_postq(l, wait)) - return -1; - - return push(l, p, wait); -@@ -199,8 +199,9 @@ - pa_assert(l); - pa_assert(p); - -- if (pa_asyncq_push(l, p, FALSE) >= 0) -- return; -+ if (flush_postq(l, FALSE)) -+ if (pa_asyncq_push(l, p, FALSE) >= 0) -+ return; - - /* OK, we couldn't push anything in the queue. So let's queue it - * locally and push it later */ -@@ -299,7 +300,7 @@ + calc_linear_integer_volume(linear, volume); - for (;;) { +- e = (uint8_t*) ptr + c->length/3; ++ e = (uint8_t*) ptr + c->length; -- if (flush_postq(l)) -+ if (flush_postq(l, FALSE)) - break; +- for (channel = 0, d = ptr; d < e; d++) { ++ for (channel = 0, d = ptr; d < e; d += 3) { + int64_t t; - if (pa_fdsem_before_poll(l->read_fdsem) >= 0) { -Index: pulseaudio-0.9.14/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2009-01-31 15:24:30.000000000 -0500 -+++ src/pulsecore/sink.c 2009-01-31 15:24:55.000000000 -0500 -@@ -641,7 +641,7 @@ + t = (int64_t)((int32_t) (PA_READ24NE(d) << 8)); +@@ -854,9 +854,9 @@ void pa_volume_memchunk( - pa_assert(length > 0); + calc_linear_integer_volume(linear, volume); -- n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; -+ n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); +- e = (uint8_t*) ptr + c->length/3; ++ e = (uint8_t*) ptr + c->length; - if (n == 0) { +- for (channel = 0, d = ptr; d < e; d++) { ++ for (channel = 0, d = ptr; d < e; d += 3) { + int64_t t; -@@ -684,8 +684,7 @@ - result->index = 0; + t = (int64_t)((int32_t) (PA_READ24RE(d) << 8)); +From 55244f7a07335115caf2b9cc57aecc0f8cd08030 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 1 May 2009 04:14:02 +0200 +Subject: [PATCH 20/28] sample-util: properly allocate silence block for s24-32 formats + +--- + src/pulsecore/sample-util.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c +index a3e490b..dda3883 100644 +--- src/pulsecore/sample-util.c ++++ src/pulsecore/sample-util.c +@@ -1181,6 +1181,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool, + case PA_SAMPLE_S32BE: + case PA_SAMPLE_S24LE: + case PA_SAMPLE_S24BE: ++ case PA_SAMPLE_S24_32LE: ++ case PA_SAMPLE_S24_32RE: + case PA_SAMPLE_FLOAT32LE: + case PA_SAMPLE_FLOAT32BE: + cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0); +@@ -1189,6 +1191,8 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool, + cache->blocks[PA_SAMPLE_S32BE] = pa_memblock_ref(b); + cache->blocks[PA_SAMPLE_S24LE] = pa_memblock_ref(b); + cache->blocks[PA_SAMPLE_S24BE] = pa_memblock_ref(b); ++ cache->blocks[PA_SAMPLE_S24_32LE] = pa_memblock_ref(b); ++ cache->blocks[PA_SAMPLE_S24_32BE] = pa_memblock_ref(b); + cache->blocks[PA_SAMPLE_FLOAT32LE] = pa_memblock_ref(b); + cache->blocks[PA_SAMPLE_FLOAT32BE] = pa_memblock_ref(b); + break; +From 100af7efac584be9f229f4daf663dbb939f5d929 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 1 May 2009 04:22:08 +0200 +Subject: [PATCH 21/28] sconv: fix a few minor conversion issues + +--- + src/pulsecore/sconv-s16le.c | 10 +++++----- + src/pulsecore/sconv.c | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git src/pulsecore/sconv-s16le.c src/pulsecore/sconv-s16le.c +index 307ce7b..43b8cb3 100644 +--- src/pulsecore/sconv-s16le.c ++++ src/pulsecore/sconv-s16le.c +@@ -370,7 +370,7 @@ void pa_sconv_s24_32le_to_s16ne(unsigned n, const uint32_t *a, int16_t *b) { + pa_assert(b); + + for (; n > 0; n--) { +- *b = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8) >> 16); ++ *b = (int16_t) (((int32_t) (UINT32_FROM(*a) << 8)) >> 16); + a++; + b++; } - -- if (s->thread_info.state == PA_SINK_RUNNING) -- inputs_drop(s, info, n, result); -+ inputs_drop(s, info, n, result); - - pa_sink_unref(s); - } -@@ -715,7 +714,7 @@ - - pa_assert(length > 0); - -- n = s->thread_info.state == PA_SINK_RUNNING ? fill_mix_info(s, &length, info, MAX_MIX_CHANNELS) : 0; -+ n = fill_mix_info(s, &length, info, MAX_MIX_CHANNELS); - - if (n == 0) { - if (target->length > length) -@@ -764,8 +763,7 @@ - pa_memblock_release(target->memblock); +@@ -416,8 +416,8 @@ void pa_sconv_s24_32le_to_float32ne(unsigned n, const uint32_t *a, float *b) { + pa_assert(b); + + for (; n > 0; n--) { +- int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8)); +- *b = ((float) s) / 0x7FFFFFFF; ++ int32_t s = (int32_t) (UINT32_FROM(*a) << 8); ++ *b = (float) s / (float) 0x7FFFFFFF; + a ++; + b ++; } - -- if (s->thread_info.state == PA_SINK_RUNNING) -- inputs_drop(s, info, n, target); -+ inputs_drop(s, info, n, target); - - pa_sink_unref(s); +@@ -428,8 +428,8 @@ void pa_sconv_s24_32le_to_float32re(unsigned n, const uint32_t *a, float *b) { + pa_assert(b); + + for (; n > 0; n--) { +- int32_t s = (int16_t) ((int32_t) (UINT32_FROM(*a) << 8)); +- float k = ((float) s) / 0x7FFFFFFF; ++ int32_t s = (int32_t) (UINT32_FROM(*a) << 8); ++ float k = (float) s / (float) 0x7FFFFFFF; + *b = PA_FLOAT32_SWAP(k); + a ++; + b ++; +diff --git src/pulsecore/sconv.c src/pulsecore/sconv.c +index 29a9a45..d89f428 100644 +--- src/pulsecore/sconv.c ++++ src/pulsecore/sconv.c +@@ -75,7 +75,7 @@ static void u8_from_s16ne(unsigned n, const int16_t *a, uint8_t *b) { + pa_assert(b); + + for (; n > 0; n--, a++, b++) +- *b = (uint8_t) (*a / 0x100 + 0x80); ++ *b = (uint8_t) ((uint16_t) *a >> 8) + (uint8_t) 0x80U; } -Index: pulseaudio-0.9.14/src/pulsecore/source.c -=================================================================== ---- src/pulsecore/source.c 2009-01-31 15:24:30.000000000 -0500 -+++ src/pulsecore/source.c 2009-01-31 15:24:55.000000000 -0500 -@@ -428,9 +428,6 @@ - pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); - pa_assert(chunk); - -- if (s->thread_info.state != PA_SOURCE_RUNNING) -- return; -- - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { - pa_memchunk vchunk = *chunk; - -@@ -469,9 +466,6 @@ - pa_assert(o->thread_info.direct_on_input); - pa_assert(chunk); - -- if (s->thread_info.state != PA_SOURCE_RUNNING) -- return; -- - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { - pa_memchunk vchunk = *chunk; - -Index: pulseaudio-0.9.14/src/modules/module-device-restore.c -=================================================================== ---- src/modules/module-device-restore.c 2009-01-31 15:47:31.000000000 -0500 -+++ src/modules/module-device-restore.c 2009-01-31 15:47:55.000000000 -0500 -@@ -98,14 +98,14 @@ - pa_log_info("Synced."); - } - --static struct entry* read_entry(struct userdata *u, char *name) { -+static struct entry* read_entry(struct userdata *u, const char *name) { - datum key, data; - struct entry *e; - - pa_assert(u); - pa_assert(name); -- key.dptr = name; -+ key.dptr = (char*) name; - key.dsize = (int) strlen(name); - - data = gdbm_fetch(u->gdbm_file, key); -@@ -235,13 +235,22 @@ - if ((e = read_entry(u, name))) { - - if (u->restore_volume) { -- pa_log_info("Restoring volume for sink %s.", new_data->name); -- pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); -+ -+ if (!new_data->volume_is_set) { -+ pa_log_info("Restoring volume for sink %s.", new_data->name); -+ pa_sink_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); -+ } else -+ pa_log_debug("Not restoring volume for sink %s, because already set.", new_data->name); -+ - } + /* float32 */ +From 1ab53c43c17943d49fc80c86ef2b513354eddc63 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Thu, 14 May 2009 03:52:13 +0200 +Subject: [PATCH 23/28] rescue: make we don't end up in an endless loop when we can't move a sink input + +--- + src/modules/module-rescue-streams.c | 38 +++++++++++++++++++--------------- + 1 files changed, 21 insertions(+), 17 deletions(-) + +diff --git src/modules/module-rescue-streams.c src/modules/module-rescue-streams.c +index 7c99a9b..c22711a 100644 +--- src/modules/module-rescue-streams.c ++++ src/modules/module-rescue-streams.c +@@ -31,6 +31,7 @@ + #include <pulsecore/modargs.h> + #include <pulsecore/log.h> + #include <pulsecore/namereg.h> ++#include <pulsecore/core-util.h> - if (u->restore_muted) { -- pa_log_info("Restoring mute state for sink %s.", new_data->name); -- pa_sink_new_data_set_muted(new_data, e->muted); -+ -+ if (!new_data->muted_is_set) { -+ pa_log_info("Restoring mute state for sink %s.", new_data->name); -+ pa_sink_new_data_set_muted(new_data, e->muted); -+ } else -+ pa_log_debug("Not restoring mute state for sink %s, because already set.", new_data->name); - } + #include "module-rescue-streams-symdef.h" - pa_xfree(e); -@@ -263,13 +272,21 @@ - if ((e = read_entry(u, name))) { +@@ -49,6 +50,7 @@ struct userdata { - if (u->restore_volume) { -- pa_log_info("Restoring volume for source %s.", new_data->name); -- pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); -+ -+ if (!new_data->volume_is_set) { -+ pa_log_info("Restoring volume for source %s.", new_data->name); -+ pa_source_new_data_set_volume(new_data, pa_cvolume_remap(&e->volume, &e->channel_map, &new_data->channel_map)); -+ } else -+ pa_log_debug("Not restoring volume for source %s, because already set.", new_data->name); - } + static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* userdata) { + pa_sink_input *i; ++ uint32_t idx; + pa_sink *target; - if (u->restore_muted) { -- pa_log_info("Restoring mute state for source %s.", new_data->name); -- pa_source_new_data_set_muted(new_data, e->muted); -+ -+ if (!new_data->muted_is_set) { -+ pa_log_info("Restoring mute state for source %s.", new_data->name); -+ pa_source_new_data_set_muted(new_data, e->muted); -+ } else -+ pa_log_debug("Not restoring mute state for source %s, because already set.", new_data->name); - } - - pa_xfree(e); -Index: pulseaudio-0.9.14/src/modules/module-oss.c -=================================================================== ---- src/modules/module-oss.c 2009-01-31 16:09:19.000000000 -0500 -+++ src/modules/module-oss.c 2009-01-31 16:13:16.000000000 -0500 -@@ -121,7 +121,7 @@ - int mixer_fd; - int mixer_devmask; - -- int nfrags, frag_size; -+ int nfrags, frag_size, orig_frag_size; - - pa_bool_t use_mmap; - unsigned out_mmap_current, in_mmap_current; -@@ -536,7 +536,7 @@ + pa_assert(c); +@@ -58,15 +60,14 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user + if (c->state == PA_CORE_SHUTDOWN) + return PA_HOOK_OK; + +- if (!pa_idxset_size(sink->inputs)) { ++ if (pa_idxset_size(sink->inputs) <= 0) { + pa_log_debug("No sink inputs to move away."); + return PA_HOOK_OK; } - if (u->nfrags >= 2 && u->frag_size >= 1) -- if (pa_oss_set_fragments(u->fd, u->nfrags, u->frag_size) < 0) { -+ if (pa_oss_set_fragments(u->fd, u->nfrags, u->orig_frag_size) < 0) { - pa_log_warn("Resume failed, couldn't set original fragment settings."); - goto fail; - } -@@ -601,10 +601,10 @@ - - build_pollfd(u); - -- if (u->sink) -- sink_get_volume(u->sink); -- if (u->source) -- source_get_volume(u->source); -+ if (u->sink && u->sink->get_volume) -+ u->sink->get_volume(u->sink); -+ if (u->source && u->source->get_volume) -+ u->source->get_volume(u->source); - - pa_log_info("Resumed successfully..."); - -@@ -877,7 +877,7 @@ - - /* pa_log("loop"); */ - -- if (PA_SINK_IS_OPENED(u->sink->thread_info.state)) -+ if (u->sink && PA_SINK_IS_OPENED(u->sink->thread_info.state)) - if (u->sink->thread_info.rewind_requested) - pa_sink_process_rewind(u->sink, 0); - -@@ -1144,7 +1144,7 @@ - struct userdata *u = NULL; - const char *dev; - int fd = -1; -- int nfrags, frag_size; -+ int nfrags, orig_frag_size, frag_size; - int mode, caps; - pa_bool_t record = TRUE, playback = TRUE, use_mmap = TRUE; - pa_sample_spec ss; -@@ -1201,14 +1201,14 @@ - - if (use_mmap && (!(caps & DSP_CAP_MMAP) || !(caps & DSP_CAP_TRIGGER))) { - pa_log_info("OSS device not mmap capable, falling back to UNIX read/write mode."); -- use_mmap = 0; -+ use_mmap = FALSE; - } + if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SINK)) || target == sink) { +- uint32_t idx; - #ifndef __FreeBSD__ - if (use_mmap && mode == O_WRONLY) { - pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode."); -- use_mmap = 0; -+ use_mmap = FALSE; - } - #endif +- for (target = pa_idxset_first(c->sinks, &idx); target; target = pa_idxset_next(c->sinks, &idx)) ++ PA_IDXSET_FOREACH(target, c->sinks, idx) + if (target != sink) + break; - if (pa_oss_get_hw_description(dev, hwdesc, sizeof(hwdesc)) >= 0) -@@ -1216,6 +1216,7 @@ - - pa_log_info("Device opened in %s mode.", mode == O_WRONLY ? "O_WRONLY" : (mode == O_RDONLY ? "O_RDONLY" : "O_RDWR")); - -+ orig_frag_size = frag_size; - if (nfrags >= 2 && frag_size >= 1) - if (pa_oss_set_fragments(fd, nfrags, frag_size) < 0) - goto fail; -@@ -1235,6 +1236,7 @@ - m->userdata = u; - u->fd = fd; - u->mixer_fd = -1; -+ u->mixer_devmask = 0; - u->use_getospace = u->use_getispace = TRUE; - u->use_getodelay = TRUE; - u->mode = mode; -@@ -1242,6 +1244,7 @@ - u->device_name = pa_xstrdup(dev); - u->in_nfrags = u->out_nfrags = (uint32_t) (u->nfrags = nfrags); - u->out_fragment_size = u->in_fragment_size = (uint32_t) (u->frag_size = frag_size); -+ u->orig_frag_size = orig_frag_size; - u->use_mmap = use_mmap; - u->rtpoll = pa_rtpoll_new(); - pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); -@@ -1383,7 +1386,6 @@ - - if ((u->mixer_fd = pa_oss_open_mixer_for_device(u->device_name)) >= 0) { - pa_bool_t do_close = TRUE; -- u->mixer_devmask = 0; - - if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &u->mixer_devmask) < 0) - pa_log_warn("SOUND_MIXER_READ_DEVMASK failed: %s", pa_cstrerror(errno)); -@@ -1409,6 +1411,7 @@ - if (do_close) { - pa_close(u->mixer_fd); - u->mixer_fd = -1; -+ u->mixer_devmask = 0; +@@ -76,20 +77,24 @@ static pa_hook_result_t sink_hook_callback(pa_core *c, pa_sink *sink, void* user } } -Index: pulseaudio-0.9.14/src/modules/oss-util.c -=================================================================== ---- src/modules/oss-util.c 2009-01-31 16:09:19.000000000 -0500 -+++ src/modules/oss-util.c 2009-01-31 16:12:37.000000000 -0500 -@@ -241,6 +241,8 @@ - int arg; - arg = ((int) nfrags << 16) | simple_log2(frag_size); +- while ((i = pa_idxset_first(sink->inputs, NULL))) { ++ pa_assert(target != sink); ++ ++ PA_IDXSET_FOREACH(i, sink->inputs, idx) { + if (pa_sink_input_move_to(i, target, FALSE) < 0) +- pa_log_warn("Failed to move sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ pa_log_info("Failed to move sink input %u \"%s\" to %s.", i->index, ++ pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); + else +- pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ pa_log_info("Sucessfully moved sink input %u \"%s\" to %s.", i->index, ++ pa_strnull(pa_proplist_gets(i->proplist, PA_PROP_APPLICATION_NAME)), target->name); + } -+ pa_log_debug("Asking for %i fragments of size %i (requested %i)", nfrags, 1 << simple_log2(frag_size), frag_size); -+ - if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &arg) < 0) { - pa_log("SNDCTL_DSP_SETFRAGMENT: %s", pa_cstrerror(errno)); - return -1; -Index: pulseaudio-0.9.14/src/pulse/volume.c -=================================================================== ---- src/pulse/volume.c 2009-01-31 16:22:02.000000000 -0500 -+++ src/pulse/volume.c 2009-01-31 16:22:50.000000000 -0500 -@@ -304,7 +304,7 @@ - p == PA_CHANNEL_POSITION_LFE; +- + return PA_HOOK_OK; } --pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to) { -+pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to) { - int a, b; - pa_cvolume result; - -Index: pulseaudio-0.9.14/src/pulse/volume.h -=================================================================== ---- src/pulse/volume.h 2009-01-31 16:22:02.000000000 -0500 -+++ src/pulse/volume.h 2009-01-31 16:23:21.000000000 -0500 -@@ -207,7 +207,7 @@ - #endif - - /** Remap a volume from one channel mapping to a different channel mapping. \since 0.9.12 */ --pa_cvolume *pa_cvolume_remap(pa_cvolume *v, pa_channel_map *from, pa_channel_map *to); -+pa_cvolume *pa_cvolume_remap(pa_cvolume *v, const pa_channel_map *from, const pa_channel_map *to); - - /** Return non-zero if the specified volume is compatible with - * the specified sample spec. \since 0.9.13 */ -Index: pulseaudio-0.9.14/src/modules/module-esound-sink.c -=================================================================== ---- src/modules/module-esound-sink.c 2009-01-31 16:25:18.000000000 -0500 -+++ src/modules/module-esound-sink.c 2009-01-31 16:25:40.000000000 -0500 -@@ -168,7 +168,7 @@ - w = pa_bytes_to_usec((uint64_t) u->offset + u->memchunk.length, &u->sink->sample_spec); - - *((pa_usec_t*) data) = w > r ? w - r : 0; -- break; -+ return 0; - } - - case SINK_MESSAGE_PASS_SOCKET: { -Index: pulseaudio-0.9.14/src/pulsecore/ltdl-helper.c -=================================================================== ---- src/pulsecore/ltdl-helper.c 2009-02-04 18:50:11.000000000 -0500 -+++ src/pulsecore/ltdl-helper.c 2009-02-04 18:50:21.000000000 -0500 -@@ -42,7 +42,9 @@ - pa_assert(handle); - pa_assert(symbol); - -- if ((f = ((pa_void_func_t) (size_t) lt_dlsym(handle, symbol)))) -+ *(void**) &f = lt_dlsym(handle, symbol); -+ -+ if (f) - return f; + static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void* userdata) { + pa_source_output *o; + pa_source *target; ++ uint32_t idx; - if (!module) -@@ -57,7 +59,7 @@ - if (!isalnum(*c)) - *c = '_'; - -- f = (pa_void_func_t) (size_t) lt_dlsym(handle, sn); -+ *(void**) &f = lt_dlsym(handle, sn); - pa_xfree(sn); - - return f; -Index: pulseaudio-0.9.14/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2009-02-04 19:05:00.000000000 -0500 -+++ src/pulsecore/sink.c 2009-02-04 19:05:50.000000000 -0500 -@@ -467,6 +467,9 @@ - s->thread_info.rewind_nbytes = 0; - s->thread_info.rewind_requested = FALSE; - -+ if (s->thread_info.state == PA_SINK_SUSPENDED) -+ return; -+ - if (nbytes > 0) - pa_log_debug("Processing rewind..."); - -@@ -476,7 +479,7 @@ + pa_assert(c); + pa_assert(source); +@@ -98,15 +103,14 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void + if (c->state == PA_CORE_SHUTDOWN) + return PA_HOOK_OK; + +- if (!pa_idxset_size(source->outputs)) { ++ if (pa_idxset_size(source->outputs) <= 0) { + pa_log_debug("No source outputs to move away."); + return PA_HOOK_OK; } - if (nbytes > 0) -- if (s->monitor_source && PA_SOURCE_IS_OPENED(s->monitor_source->thread_info.state)) -+ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) - pa_source_process_rewind(s->monitor_source, nbytes); - } + if (!(target = pa_namereg_get(c, NULL, PA_NAMEREG_SOURCE)) || target == source) { +- uint32_t idx; -@@ -556,7 +559,7 @@ - /* Drop read data */ - pa_sink_input_drop(i, result->length); +- for (target = pa_idxset_first(c->sources, &idx); target; target = pa_idxset_next(c->sources, &idx)) ++ PA_IDXSET_FOREACH(target, c->sources, idx) + if (target != source && !target->monitor_of == !source->monitor_of) + break; -- if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source))) { -+ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) { +@@ -118,19 +122,20 @@ static pa_hook_result_t source_hook_callback(pa_core *c, pa_source *source, void - if (pa_hashmap_size(i->thread_info.direct_outputs) > 0) { - void *ostate = NULL; -@@ -612,7 +615,7 @@ - } + pa_assert(target != source); + +- while ((o = pa_idxset_first(source->outputs, NULL))) { ++ PA_IDXSET_FOREACH(o, source->outputs, idx) { + if (pa_source_output_move_to(o, target, FALSE) < 0) +- pa_log_warn("Failed to move source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ pa_log_info("Failed to move source output %u \"%s\" to %s.", o->index, ++ pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name); + else +- pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME), target->name); ++ pa_log_info("Sucessfully moved source output %u \"%s\" to %s.", o->index, ++ pa_strnull(pa_proplist_gets(o->proplist, PA_PROP_APPLICATION_NAME)), target->name); } -- if (s->monitor_source && PA_SOURCE_IS_OPENED(pa_source_get_state(s->monitor_source))) -+ if (s->monitor_source && PA_SOURCE_IS_LINKED(s->monitor_source->thread_info.state)) - pa_source_post(s->monitor_source, result); +- + return PA_HOOK_OK; } -@@ -623,7 +626,7 @@ - size_t block_size_max; - - pa_sink_assert_ref(s); -- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - pa_assert(pa_frame_aligned(length, &s->sample_spec)); - pa_assert(result); + int pa__init(pa_module*m) { +- pa_modargs *ma = NULL; ++ pa_modargs *ma; + struct userdata *u; -@@ -632,6 +635,13 @@ - pa_assert(!s->thread_info.rewind_requested); - pa_assert(s->thread_info.rewind_nbytes == 0); + pa_assert(m); +@@ -153,10 +158,9 @@ void pa__done(pa_module*m) { -+ if (s->thread_info.state == PA_SINK_SUSPENDED) { -+ result->memblock = pa_memblock_ref(s->silence.memblock); -+ result->index = s->silence.index; -+ result->length = PA_MIN(s->silence.length, length); -+ return; -+ } -+ - if (length <= 0) - length = pa_frame_align(MIX_BUFFER_LENGTH, &s->sample_spec); - -@@ -696,7 +706,7 @@ - size_t length, block_size_max; - - pa_sink_assert_ref(s); -- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - pa_assert(target); - pa_assert(target->memblock); - pa_assert(target->length > 0); -@@ -707,6 +717,11 @@ - pa_assert(!s->thread_info.rewind_requested); - pa_assert(s->thread_info.rewind_nbytes == 0); - -+ if (s->thread_info.state == PA_SINK_SUSPENDED) { -+ pa_silence_memchunk(target, &s->sample_spec); -+ return; -+ } -+ - length = target->length; - block_size_max = pa_mempool_block_size_max(s->core->mempool); - if (length > block_size_max) -@@ -774,7 +789,7 @@ - size_t l, d; - - pa_sink_assert_ref(s); -- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - pa_assert(target); - pa_assert(target->memblock); - pa_assert(target->length > 0); -@@ -804,7 +819,7 @@ - /* Called from IO thread context */ - void pa_sink_render_full(pa_sink *s, size_t length, pa_memchunk *result) { - pa_sink_assert_ref(s); -- pa_assert(PA_SINK_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - pa_assert(length > 0); - pa_assert(pa_frame_aligned(length, &s->sample_spec)); - pa_assert(result); -@@ -830,7 +845,7 @@ - - /* The returned value is supposed to be in the time domain of the sound card! */ - -- if (!PA_SINK_IS_OPENED(s->state)) -+ if (s->state == PA_SINK_SUSPENDED) - return 0; - - if (!(s->flags & PA_SINK_LATENCY)) -@@ -1342,6 +1357,9 @@ - pa_sink_assert_ref(s); - pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - -+ if (s->thread_info.state == PA_SINK_SUSPENDED) -+ return; -+ - if (nbytes == (size_t) -1) - nbytes = s->thread_info.max_rewind; - -@@ -1403,7 +1421,7 @@ - pa_sink_assert_ref(s); - pa_assert(PA_SINK_IS_LINKED(s->state)); - -- if (!PA_SINK_IS_OPENED(s->state)) -+ if (s->state == PA_SINK_SUSPENDED) - return 0; + pa_assert(m); - pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); -Index: pulseaudio-0.9.14/src/pulsecore/source.c -=================================================================== ---- src/pulsecore/source.c 2009-02-04 19:05:00.000000000 -0500 -+++ src/pulsecore/source.c 2009-02-04 19:05:50.000000000 -0500 -@@ -406,7 +406,10 @@ - void *state = NULL; - - pa_source_assert_ref(s); -- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); -+ -+ if (s->thread_info.state == PA_SOURCE_SUSPENDED) -+ return; - - if (nbytes <= 0) +- if (!m->userdata) ++ if (!(u = m->userdata)) return; -@@ -425,9 +428,12 @@ - void *state = NULL; - pa_source_assert_ref(s); -- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); - pa_assert(chunk); - -+ if (s->thread_info.state == PA_SOURCE_SUSPENDED) -+ return; -+ - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { - pa_memchunk vchunk = *chunk; - -@@ -461,11 +467,14 @@ - /* Called from IO thread context */ - void pa_source_post_direct(pa_source*s, pa_source_output *o, const pa_memchunk *chunk) { - pa_source_assert_ref(s); -- pa_assert(PA_SOURCE_IS_OPENED(s->thread_info.state)); -+ pa_assert(PA_SOURCE_IS_LINKED(s->thread_info.state)); - pa_source_output_assert_ref(o); - pa_assert(o->thread_info.direct_on_input); - pa_assert(chunk); - -+ if (s->thread_info.state == PA_SOURCE_SUSPENDED) -+ return; -+ - if (s->thread_info.soft_muted || !pa_cvolume_is_norm(&s->thread_info.soft_volume)) { - pa_memchunk vchunk = *chunk; - -@@ -491,7 +500,7 @@ - pa_source_assert_ref(s); - pa_assert(PA_SOURCE_IS_LINKED(s->state)); - -- if (!PA_SOURCE_IS_OPENED(s->state)) -+ if (s->state == PA_SOURCE_SUSPENDED) - return 0; - - if (!(s->flags & PA_SOURCE_LATENCY)) -@@ -882,7 +891,7 @@ - pa_source_assert_ref(s); - pa_assert(PA_SOURCE_IS_LINKED(s->state)); - -- if (!PA_SOURCE_IS_OPENED(s->state)) -+ if (s->state == PA_SOURCE_SUSPENDED) - return 0; - - pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_REQUESTED_LATENCY, &usec, 0, NULL) == 0); -Index: pulseaudio-0.9.14/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2009-02-04 19:19:17.000000000 -0500 -+++ src/pulsecore/sink.c 2009-02-04 19:19:24.000000000 -0500 -@@ -464,6 +464,11 @@ - pa_sink_assert_ref(s); - pa_assert(PA_SINK_IS_LINKED(s->thread_info.state)); - -+ /* If nobody requested this and this is actually no real rewind -+ * then we can short cut this */ -+ if (!s->thread_info.rewind_requested && nbytes <= 0) -+ return; -+ - s->thread_info.rewind_nbytes = 0; - s->thread_info.rewind_requested = FALSE; - -Index: pulseaudio-0.9.14/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2009-02-04 19:21:36.000000000 -0500 -+++ src/pulsecore/sink.c 2009-02-04 19:21:54.000000000 -0500 -@@ -1235,6 +1235,10 @@ - case PA_SINK_MESSAGE_SET_STATE: +- u = m->userdata; + if (u->sink_slot) + pa_hook_slot_free(u->sink_slot); + if (u->source_slot) +From c41d9c71667de6d6e9aab077ac58b7371594bbef Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 8 May 2009 01:56:21 +0200 +Subject: [PATCH 24/28] core: introduce pa_{sink,source}_set_fixed_latency() + +This allows us to forward the fixed latency directly from the sink to +the monitor source withut having to wait for pa_sink_put(). +--- + src/modules/alsa/alsa-sink.c | 4 ++-- + src/modules/alsa/alsa-source.c | 4 ++-- + src/modules/bluetooth/module-bluetooth-device.c | 12 ++++++------ + src/modules/module-pipe-sink.c | 2 +- + src/modules/module-pipe-source.c | 2 +- + src/modules/module-sine-source.c | 3 +-- + src/modules/oss/module-oss.c | 4 ++-- + src/pulsecore/sink.c | 16 ++++++++++++++++ + src/pulsecore/sink.h | 1 + + src/pulsecore/source.c | 15 +++++++++++++++ + src/pulsecore/source.h | 1 + + 11 files changed, 48 insertions(+), 16 deletions(-) + +diff --git src/modules/alsa/alsa-sink.c src/modules/alsa/alsa-sink.c +index a544b58..94e15df 100644 +--- src/modules/alsa/alsa-sink.c ++++ src/modules/alsa/alsa-sink.c +@@ -473,7 +473,7 @@ static int mmap_write(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polle + u->since_start += frames * u->frame_size; + + #ifdef DEBUG_TIMING +- pa_log_debug("Wrote %lu bytes", (unsigned long) (frames * u->frame_size)); ++ pa_log_debug("Wrote %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes); + #endif - s->thread_info.state = PA_PTR_TO_UINT(userdata); -+ -+ if (s->thread_info.state == PA_SINK_SUSPENDED) -+ s->thread_info.rewind_requested = FALSE; -+ - return 0; + if ((size_t) frames * u->frame_size >= n_bytes) +@@ -1730,7 +1730,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca + pa_log_info("Time scheduling watermark is %0.2fms", + (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC); + } else +- u->sink->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss); ++ pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->hwbuf_size, &ss)); + + reserve_update(u); + +diff --git src/modules/alsa/alsa-source.c src/modules/alsa/alsa-source.c +index 5d8e349..c2f905a 100644 +--- src/modules/alsa/alsa-source.c ++++ src/modules/alsa/alsa-source.c +@@ -455,7 +455,7 @@ static int mmap_read(struct userdata *u, pa_usec_t *sleep_usec, pa_bool_t polled + u->read_count += frames * u->frame_size; + + #ifdef DEBUG_TIMING +- pa_log_debug("Read %lu bytes", (unsigned long) (frames * u->frame_size)); ++ pa_log_debug("Read %lu bytes (of possible %lu bytes)", (unsigned long) (frames * u->frame_size), (unsigned long) n_bytes); + #endif - case PA_SINK_MESSAGE_DETACH: -Index: pulseaudio-0.9.14/src/utils/pacmd.c -=================================================================== ---- src/utils/pacmd.c 2009-02-04 19:35:26.000000000 -0500 -+++ src/utils/pacmd.c 2009-02-04 19:35:33.000000000 -0500 -@@ -47,16 +47,16 @@ - int fd = -1; - int ret = 1, i; - struct sockaddr_un sa; -- char ibuf[256], obuf[256]; -+ char ibuf[PIPE_BUF], obuf[PIPE_BUF]; - size_t ibuf_index, ibuf_length, obuf_index, obuf_length; -- fd_set ifds, ofds; - char *cli; -+ pa_bool_t ibuf_eof, obuf_eof, ibuf_closed, obuf_closed; - - setlocale(LC_ALL, ""); - bindtextdomain(GETTEXT_PACKAGE, PULSE_LOCALEDIR); - - if (pa_pid_file_check_running(&pid, "pulseaudio") < 0) { -- pa_log("No PulseAudio daemon running"); -+ pa_log("No PulseAudio daemon running, or not running as session daemon."); - goto fail; + if ((size_t) frames * u->frame_size >= n_bytes) +@@ -1582,7 +1582,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p + pa_log_info("Time scheduling watermark is %0.2fms", + (double) pa_bytes_to_usec(u->tsched_watermark, &ss) / PA_USEC_PER_MSEC); + } else +- u->source->fixed_latency = pa_bytes_to_usec(u->hwbuf_size, &ss); ++ pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->hwbuf_size, &ss)); + + reserve_update(u); + +diff --git src/modules/bluetooth/module-bluetooth-device.c src/modules/bluetooth/module-bluetooth-device.c +index 90f6486..3465b80 100644 +--- src/modules/bluetooth/module-bluetooth-device.c ++++ src/modules/bluetooth/module-bluetooth-device.c +@@ -1608,9 +1608,9 @@ static int add_sink(struct userdata *u) { + u->sink->parent.process_msg = sink_process_msg; + + pa_sink_set_max_request(u->sink, u->block_size); +- u->sink->fixed_latency = +- (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) + +- pa_bytes_to_usec(u->block_size, &u->sample_spec); ++ pa_sink_set_fixed_latency(u->sink, ++ (u->profile == PROFILE_A2DP ? FIXED_LATENCY_PLAYBACK_A2DP : FIXED_LATENCY_PLAYBACK_HSP) + ++ pa_bytes_to_usec(u->block_size, &u->sample_spec)); } -@@ -99,15 +99,47 @@ + if (u->profile == PROFILE_HSP) { +@@ -1659,9 +1659,9 @@ static int add_source(struct userdata *u) { + u->source->userdata = u; + u->source->parent.process_msg = source_process_msg; + +- u->source->fixed_latency = +- (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) + +- pa_bytes_to_usec(u->block_size, &u->sample_spec); ++ pa_source_set_fixed_latency(u->source, ++ (/* u->profile == PROFILE_A2DP ? FIXED_LATENCY_RECORD_A2DP : */ FIXED_LATENCY_RECORD_HSP) + ++ pa_bytes_to_usec(u->block_size, &u->sample_spec)); } - ibuf_index = ibuf_length = obuf_index = obuf_length = 0; -+ ibuf_eof = obuf_eof = ibuf_closed = obuf_closed = FALSE; - -+ if (argc > 1) { -+ for (i = 1; i < argc; i++) { -+ size_t k; -+ -+ k = PA_MIN(sizeof(ibuf) - ibuf_length, strlen(argv[i])); -+ memcpy(ibuf + ibuf_length, argv[1], k); -+ ibuf_length += k; -+ -+ if (ibuf_length < sizeof(ibuf)) { -+ ibuf[ibuf_length] = i < argc-1 ? ' ' : '\n'; -+ ibuf_length++; -+ } -+ } - -- FD_ZERO(&ifds); -- FD_SET(0, &ifds); -- FD_SET(fd, &ifds); + if (u->profile == PROFILE_HSP) { +diff --git src/modules/module-pipe-sink.c src/modules/module-pipe-sink.c +index 9d3e55d..304d01c 100644 +--- src/modules/module-pipe-sink.c ++++ src/modules/module-pipe-sink.c +@@ -293,7 +293,7 @@ int pa__init(pa_module*m) { + pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); + pa_sink_set_rtpoll(u->sink, u->rtpoll); + pa_sink_set_max_request(u->sink, PIPE_BUF); +- u->sink->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec); ++ pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(PIPE_BUF, &u->sink->sample_spec)); + + u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1); + pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); +diff --git src/modules/module-pipe-source.c src/modules/module-pipe-source.c +index df72d79..6ed4fbf 100644 +--- src/modules/module-pipe-source.c ++++ src/modules/module-pipe-source.c +@@ -277,7 +277,7 @@ int pa__init(pa_module*m) { + + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); +- u->source->fixed_latency = pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec); ++ pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec)); + + u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1); + pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); +diff --git src/modules/module-sine-source.c src/modules/module-sine-source.c +index a5f1ce7..a6e15d8 100644 +--- src/modules/module-sine-source.c ++++ src/modules/module-sine-source.c +@@ -264,8 +264,7 @@ int pa__init(pa_module*m) { + + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); +- u->source->fixed_latency = u->block_usec; - -- FD_ZERO(&ofds); -+ ibuf_eof = TRUE; -+ } ++ pa_source_set_fixed_latency(u->source, u->block_usec); + + if (!(u->thread = pa_thread_new(thread_func, u))) { + pa_log("Failed to create thread."); +diff --git src/modules/oss/module-oss.c src/modules/oss/module-oss.c +index aa5f918..d6f549c 100644 +--- src/modules/oss/module-oss.c ++++ src/modules/oss/module-oss.c +@@ -1328,8 +1328,8 @@ int pa__init(pa_module*m) { + + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); ++ pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec)); + u->source->refresh_volume = TRUE; +- u->source->fixed_latency = pa_bytes_to_usec(u->in_hwbuf_size, &u->source->sample_spec); + + if (use_mmap) + u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags); +@@ -1390,8 +1390,8 @@ int pa__init(pa_module*m) { + + pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); + pa_sink_set_rtpoll(u->sink, u->rtpoll); ++ pa_sink_set_fixed_latency(u->sink, pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec)); + u->sink->refresh_volume = TRUE; +- u->sink->fixed_latency = pa_bytes_to_usec(u->out_hwbuf_size, &u->sink->sample_spec); + + pa_sink_set_max_request(u->sink, u->out_hwbuf_size); + +diff --git src/pulsecore/sink.c src/pulsecore/sink.c +index c99f9a8..2225886 100644 +--- src/pulsecore/sink.c ++++ src/pulsecore/sink.c +@@ -2054,6 +2054,22 @@ void pa_sink_set_latency_range_within_thread(pa_sink *s, pa_usec_t min_latency, + pa_source_set_latency_range_within_thread(s->monitor_source, min_latency, max_latency); + } - for (;;) { -+ fd_set ifds, ofds; ++/* Called from main thread, before the sink is put */ ++void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency) { ++ pa_sink_assert_ref(s); + -+ if (ibuf_eof && -+ obuf_eof && -+ ibuf_length <= 0 && -+ obuf_length <= 0) -+ break; ++ pa_assert(pa_sink_get_state(s) == PA_SINK_INIT); + -+ FD_ZERO(&ifds); -+ FD_ZERO(&ofds); ++ if (latency < ABSOLUTE_MIN_LATENCY) ++ latency = ABSOLUTE_MIN_LATENCY; + -+ if (obuf_length > 0) -+ FD_SET(1, &ofds); -+ else if (!obuf_eof) -+ FD_SET(fd, &ifds); ++ if (latency > ABSOLUTE_MAX_LATENCY) ++ latency = ABSOLUTE_MAX_LATENCY; + -+ if (ibuf_length > 0) -+ FD_SET(fd, &ofds); -+ else if (!ibuf_eof) -+ FD_SET(0, &ifds); ++ s->fixed_latency = latency; ++ pa_source_set_fixed_latency(s->monitor_source, latency); ++} + - if (select(FD_SETSIZE, &ifds, &ofds, NULL, NULL) < 0) { - pa_log(_("select(): %s"), strerror(errno)); - goto fail; -@@ -118,15 +150,16 @@ - assert(!ibuf_length); - - if ((r = read(0, ibuf, sizeof(ibuf))) <= 0) { -- if (r == 0) -- break; -- -- pa_log(_("read(): %s"), strerror(errno)); -- goto fail; -+ if (r < 0) { -+ pa_log(_("read(): %s"), strerror(errno)); -+ goto fail; -+ } -+ -+ ibuf_eof = TRUE; -+ } else { -+ ibuf_length = (size_t) r; -+ ibuf_index = 0; - } -- -- ibuf_length = (size_t) r; -- ibuf_index = 0; - } - - if (FD_ISSET(fd, &ifds)) { -@@ -134,15 +167,16 @@ - assert(!obuf_length); - - if ((r = read(fd, obuf, sizeof(obuf))) <= 0) { -- if (r == 0) -- break; -- -- pa_log(_("read(): %s"), strerror(errno)); -- goto fail; -+ if (r < 0) { -+ pa_log(_("read(): %s"), strerror(errno)); -+ goto fail; -+ } -+ -+ obuf_eof = TRUE; -+ } else { -+ obuf_length = (size_t) r; -+ obuf_index = 0; - } -- -- obuf_length = (size_t) r; -- obuf_index = 0; - } - - if (FD_ISSET(1, &ofds)) { -@@ -170,28 +204,26 @@ - - ibuf_length -= (size_t) r; - ibuf_index += obuf_index; -- - } - -- FD_ZERO(&ifds); -- FD_ZERO(&ofds); -- -- if (obuf_length <= 0) -- FD_SET(fd, &ifds); -- else -- FD_SET(1, &ofds); -+ if (ibuf_length <= 0 && ibuf_eof && !ibuf_closed) { -+ close(0); -+ shutdown(fd, SHUT_WR); -+ ibuf_closed = TRUE; -+ } - -- if (ibuf_length <= 0) -- FD_SET(0, &ifds); -- else -- FD_SET(fd, &ofds); -+ if (obuf_length <= 0 && obuf_eof && !obuf_closed) { -+ shutdown(fd, SHUT_RD); -+ close(1); -+ obuf_closed = TRUE; -+ } - } - - ret = 0; - - fail: - if (fd >= 0) -- close(fd); -+ pa_close(fd); - - return ret; + /* Called from main context */ + size_t pa_sink_get_max_rewind(pa_sink *s) { + size_t r; +diff --git src/pulsecore/sink.h src/pulsecore/sink.h +index 352282b..e33b3cf 100644 +--- src/pulsecore/sink.h ++++ src/pulsecore/sink.h +@@ -229,6 +229,7 @@ void pa_sink_set_rtpoll(pa_sink *s, pa_rtpoll *p); + void pa_sink_set_max_rewind(pa_sink *s, size_t max_rewind); + void pa_sink_set_max_request(pa_sink *s, size_t max_request); + void pa_sink_set_latency_range(pa_sink *s, pa_usec_t min_latency, pa_usec_t max_latency); ++void pa_sink_set_fixed_latency(pa_sink *s, pa_usec_t latency); + + void pa_sink_detach(pa_sink *s); + void pa_sink_attach(pa_sink *s); +diff --git src/pulsecore/source.c src/pulsecore/source.c +index 0baaed1..e8deaf7 100644 +--- src/pulsecore/source.c ++++ src/pulsecore/source.c +@@ -1280,6 +1280,21 @@ void pa_source_set_latency_range_within_thread(pa_source *s, pa_usec_t min_laten + pa_source_invalidate_requested_latency(s); } -Index: pulseaudio-0.9.14/src/modules/rtp/module-rtp-recv.c -=================================================================== ---- src/modules/rtp/module-rtp-recv.c 2009-02-06 18:04:53.000000000 -0500 -+++ src/modules/rtp/module-rtp-recv.c 2009-02-06 18:07:32.000000000 -0500 -@@ -453,7 +453,7 @@ - data.module = u->module; - pa_sink_input_new_data_set_sample_spec(&data, &sdp_info->sample_spec); - -- s->sink_input = pa_sink_input_new(u->module->core, &data, 0); -+ s->sink_input = pa_sink_input_new(u->module->core, &data, PA_SINK_INPUT_VARIABLE_RATE); - pa_sink_input_new_data_done(&data); - - if (!s->sink_input) { -Index: pulseaudio-0.9.14/src/modules/module-suspend-on-idle.c -=================================================================== ---- src/modules/module-suspend-on-idle.c 2009-02-12 18:28:26.000000000 -0500 -+++ src/modules/module-suspend-on-idle.c 2009-02-13 01:37:53.000000000 -0500 -@@ -158,6 +158,9 @@ - pa_sink_input_assert_ref(s); - pa_assert(u); -+ if (!s->sink) -+ return PA_HOOK_OK; ++/* Called from main thread, before the source is put */ ++void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency) { ++ pa_source_assert_ref(s); + - if (pa_sink_used_by(s->sink) <= 0) { - struct device_info *d; - if ((d = pa_hashmap_get(u->device_infos, s->sink))) -@@ -172,6 +175,9 @@ - pa_source_output_assert_ref(s); - pa_assert(u); - -+ if (!s->source) -+ return PA_HOOK_OK; ++ pa_assert(pa_source_get_state(s) == PA_SOURCE_INIT); + - if (pa_source_used_by(s->source) <= 0) { - struct device_info *d; - if ((d = pa_hashmap_get(u->device_infos, s->source))) -Index: pulseaudio-0.9.14/src/pulse/channelmap.c -=================================================================== ---- src/pulse/channelmap.c 2009-02-13 22:55:36.000000000 -0500 -+++ src/pulse/channelmap.c 2009-02-13 22:55:44.000000000 -0500 -@@ -216,10 +216,10 @@ - - case 6: - m->map[0] = PA_CHANNEL_POSITION_FRONT_LEFT; -- m->map[1] = PA_CHANNEL_POSITION_SIDE_LEFT; -+ m->map[1] = PA_CHANNEL_POSITION_REAR_LEFT; - m->map[2] = PA_CHANNEL_POSITION_FRONT_CENTER; - m->map[3] = PA_CHANNEL_POSITION_FRONT_RIGHT; -- m->map[4] = PA_CHANNEL_POSITION_SIDE_RIGHT; -+ m->map[4] = PA_CHANNEL_POSITION_REAR_RIGHT; - m->map[5] = PA_CHANNEL_POSITION_LFE; - return m; - -Index: pulseaudio-0.9.14/src/pulse/scache.c -=================================================================== ---- src/pulse/scache.c 2009-02-13 22:58:05.000000000 -0500 -+++ src/pulse/scache.c 2009-02-13 22:58:26.000000000 -0500 -@@ -66,10 +66,8 @@ - pa_tagstruct_put_channel_map(t, &s->channel_map); - pa_tagstruct_putu32(t, (uint32_t) length); - -- if (s->context->version >= 13) { -- pa_init_proplist(s->proplist); -+ if (s->context->version >= 13) - pa_tagstruct_put_proplist(t, s->proplist); -- } - - pa_pstream_send_tagstruct(s->context->pstream, t); - pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_create_stream_callback, s, NULL); -Index: pulseaudio-0.9.14/src/pulse/gccmacro.h -=================================================================== ---- src/pulse/gccmacro.h 2009-02-13 23:07:17.000000000 -0500 -+++ src/pulse/gccmacro.h 2009-02-13 23:09:29.000000000 -0500 -@@ -85,7 +85,7 @@ - #endif - - #ifndef PA_GCC_PACKED --#ifdef __GNUCC__ -+#ifdef __GNUC__ - #define PA_GCC_PACKED __attribute__ ((packed)) - #else - /** Structure shall be packed in memory **/ -@@ -105,7 +105,7 @@ - #endif - - #ifndef PA_GCC_MALLOC --#ifdef __GNUCC__ -+#ifdef __GNUC__ - #define PA_GCC_MALLOC __attribute__ ((malloc)) - #else - /** Macro for usage of GCC's malloc attribute */ -Index: pulseaudio-0.9.14/src/pulsecore/shm.c -=================================================================== ---- src/pulsecore/shm.c 2009-02-13 23:07:17.000000000 -0500 -+++ src/pulsecore/shm.c 2009-02-13 23:09:29.000000000 -0500 -@@ -70,14 +70,14 @@ - - /* We now put this SHM marker at the end of each segment. It's - * optional, to not require a reboot when upgrading, though */ --struct shm_marker PA_GCC_PACKED { -+struct shm_marker { - pa_atomic_t marker; /* 0xbeefcafe */ - pa_atomic_t pid; - uint64_t _reserved1; - uint64_t _reserved2; - uint64_t _reserved3; - uint64_t _reserved4; --}; -+} PA_GCC_PACKED; - - static char *segment_name(char *fn, size_t l, unsigned id) { - pa_snprintf(fn, l, "/pulse-shm-%u", id); -Index: pulseaudio-0.9.14/src/pulsecore/memblock.c -=================================================================== ---- src/pulsecore/memblock.c 2009-02-18 16:40:03.000000000 -0500 -+++ src/pulsecore/memblock.c 2009-02-18 16:40:13.000000000 -0500 -@@ -57,7 +57,7 @@ - - #define PA_MEMEXPORT_SLOTS_MAX 128 - --#define PA_MEMIMPORT_SLOTS_MAX 128 -+#define PA_MEMIMPORT_SLOTS_MAX 160 - #define PA_MEMIMPORT_SEGMENTS_MAX 16 - - struct pa_memblock { -Index: pulseaudio-0.9.14/src/pulse/context.c -=================================================================== ---- src/pulse/context.c 2009-02-18 16:45:34.000000000 -0500 -+++ src/pulse/context.c 2009-02-18 16:46:22.000000000 -0500 -@@ -332,8 +332,7 @@ - - pa_assert(p); - pa_assert(chunk); -- pa_assert(chunk->memblock); -- pa_assert(chunk->length); -+ pa_assert(chunk->length > 0); - pa_assert(c); - pa_assert(PA_REFCNT_VALUE(c) >= 1); - -@@ -341,11 +340,11 @@ - - if ((s = pa_dynarray_get(c->record_streams, channel))) { - -- pa_assert(seek == PA_SEEK_RELATIVE); -- pa_assert(offset == 0); -- -- pa_memblockq_seek(s->record_memblockq, offset, seek); -- pa_memblockq_push_align(s->record_memblockq, chunk); -+ if (chunk->memblock) { -+ pa_memblockq_seek(s->record_memblockq, offset, seek); -+ pa_memblockq_push_align(s->record_memblockq, chunk); -+ } else -+ pa_memblockq_seek(s->record_memblockq, offset+chunk->length, seek); - - if (s->read_callback) { - size_t l; -Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c -=================================================================== ---- src/pulsecore/protocol-native.c 2009-02-18 16:45:34.000000000 -0500 -+++ src/pulsecore/protocol-native.c 2009-02-18 16:46:22.000000000 -0500 -@@ -4075,17 +4075,20 @@ - if (playback_stream_isinstance(stream)) { - playback_stream *ps = PLAYBACK_STREAM(stream); - -- if (seek != PA_SEEK_RELATIVE || offset != 0) -- pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL); -- -- pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL); -+ if (chunk->memblock) { -+ if (seek != PA_SEEK_RELATIVE || offset != 0) -+ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset, NULL, NULL); ++ if (latency < ABSOLUTE_MIN_LATENCY) ++ latency = ABSOLUTE_MIN_LATENCY; + -+ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_POST_DATA, NULL, 0, chunk, NULL); -+ } else -+ pa_asyncmsgq_post(ps->sink_input->sink->asyncmsgq, PA_MSGOBJECT(ps->sink_input), SINK_INPUT_MESSAGE_SEEK, PA_UINT_TO_PTR(seek), offset+chunk->length, NULL, NULL); - - } else { - upload_stream *u = UPLOAD_STREAM(stream); - size_t l; - - if (!u->memchunk.memblock) { -- if (u->length == chunk->length) { -+ if (u->length == chunk->length && chunk->memblock) { - u->memchunk = *chunk; - pa_memblock_ref(u->memchunk.memblock); - u->length = 0; -@@ -4101,17 +4104,22 @@ - if (l > chunk->length) - l = chunk->length; - -- - if (l > 0) { -- void *src, *dst; -+ void *dst; - dst = pa_memblock_acquire(u->memchunk.memblock); -- src = pa_memblock_acquire(chunk->memblock); - -- memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length, -- (uint8_t*) src+chunk->index, l); -+ if (chunk->memblock) { -+ void *src; -+ src = pa_memblock_acquire(chunk->memblock); -+ -+ memcpy((uint8_t*) dst + u->memchunk.index + u->memchunk.length, -+ (uint8_t*) src + chunk->index, l); ++ if (latency > ABSOLUTE_MAX_LATENCY) ++ latency = ABSOLUTE_MAX_LATENCY; + -+ pa_memblock_release(chunk->memblock); -+ } else -+ pa_silence_memory((uint8_t*) dst + u->memchunk.index + u->memchunk.length, l, &u->sample_spec); - - pa_memblock_release(u->memchunk.memblock); -- pa_memblock_release(chunk->memblock); - - u->memchunk.length += l; - u->length -= l; -Index: pulseaudio-0.9.14/src/pulsecore/pstream.c -=================================================================== ---- src/pulsecore/pstream.c 2009-02-18 16:45:34.000000000 -0500 -+++ src/pulsecore/pstream.c 2009-02-18 16:48:15.000000000 -0500 -@@ -832,8 +832,7 @@ - ntohl(p->read.shm_info[PA_PSTREAM_SHM_INDEX]), - ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH])))) { - -- pa_log_warn("Failed to import memory block."); -- return -1; -+ pa_log_debug("Failed to import memory block."); - } - - if (p->recieve_memblock_callback) { -@@ -842,7 +841,7 @@ - - chunk.memblock = b; - chunk.index = 0; -- chunk.length = pa_memblock_get_length(b); -+ chunk.length = b ? pa_memblock_get_length(b) : ntohl(p->read.shm_info[PA_PSTREAM_SHM_LENGTH]); - - offset = (int64_t) ( - (((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) | -@@ -857,7 +856,8 @@ - p->recieve_memblock_callback_userdata); - } - -- pa_memblock_unref(b); -+ if (b) -+ pa_memblock_unref(b); - } - - goto frame_done; -Index: pulseaudio-0.9.14/src/pulsecore/core-error.c -=================================================================== ---- src/pulsecore/core-error.c 2009-03-05 17:12:02.000000000 -0500 -+++ src/pulsecore/core-error.c 2009-03-05 17:12:16.000000000 -0500 -@@ -47,6 +47,9 @@ - char *translated, *t; - char errbuf[128]; - -+ if (errnum < 0) -+ errnum = -errnum; -+ - if ((t = PA_STATIC_TLS_GET(cstrerror))) - pa_xfree(t); - -Index: pulseaudio-0.9.14/src/pulse/error.c -=================================================================== ---- src/pulse/error.c 2009-03-05 17:12:34.000000000 -0500 -+++ src/pulse/error.c 2009-03-05 17:12:54.000000000 -0500 -@@ -66,7 +66,10 @@ - - pa_init_i18n(); - -- if (error < 0 || error >= PA_ERR_MAX) -+ if (error < 0) -+ error = -error; -+ -+ if (error >= PA_ERR_MAX) - return NULL; - - return _(errortab[error]); -Index: pulseaudio-0.9.14/src/pulsecore/sink.c -=================================================================== ---- src/pulsecore/sink.c 2009-02-19 18:45:44.000000000 -0500 -+++ src/pulsecore/sink.c 2009-02-19 18:46:04.000000000 -0500 -@@ -1557,6 +1557,9 @@ - - pa_sink_assert_ref(s); - -+ pa_assert(!min_latency || !max_latency || -+ min_latency <= max_latency); -+ - s->thread_info.min_latency = min_latency; - s->thread_info.max_latency = max_latency; - -Index: pulseaudio-0.9.14/src/pulsecore/source.c -=================================================================== ---- src/pulsecore/source.c 2009-02-19 18:46:57.000000000 -0500 -+++ src/pulsecore/source.c 2009-02-19 18:47:08.000000000 -0500 -@@ -994,6 +994,9 @@ - - pa_source_assert_ref(s); - -+ pa_assert(!min_latency || !max_latency || -+ min_latency <= max_latency); ++ s->fixed_latency = latency; ++} + - s->thread_info.min_latency = min_latency; - s->thread_info.max_latency = max_latency; + /* Called from main thread */ + size_t pa_source_get_max_rewind(pa_source *s) { + size_t r; +diff --git src/pulsecore/source.h src/pulsecore/source.h +index b502c22..2978f57 100644 +--- src/pulsecore/source.h ++++ src/pulsecore/source.h +@@ -210,6 +210,7 @@ void pa_source_set_rtpoll(pa_source *s, pa_rtpoll *p); -Index: pulseaudio-0.9.14/src/utils/paplay.c -=================================================================== ---- src/utils/paplay.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/utils/paplay.c 2009-02-19 19:25:10.000000000 -0500 -@@ -400,7 +400,10 @@ - pa_context_set_state_callback(context, context_state_callback, NULL); - - /* Connect the context */ -- pa_context_connect(context, server, 0, NULL); -+ if (pa_context_connect(context, server, 0, NULL) < 0) { -+ fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); -+ goto quit; -+ } + void pa_source_set_max_rewind(pa_source *s, size_t max_rewind); + void pa_source_set_latency_range(pa_source *s, pa_usec_t min_latency, pa_usec_t max_latency); ++void pa_source_set_fixed_latency(pa_source *s, pa_usec_t latency); - /* Run the main loop */ - if (pa_mainloop_run(m, &ret) < 0) { -Index: pulseaudio-0.9.14/src/utils/pactl.c -=================================================================== ---- src/utils/pactl.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/utils/pactl.c 2009-02-19 19:25:10.000000000 -0500 -@@ -561,6 +561,7 @@ - pa_xfree(d); - fprintf(stderr, _("Premature end of file\n")); - quit(1); -+ return; - } - - pa_stream_write(s, d, length, pa_xfree, 0, PA_SEEK_RELATIVE); -@@ -925,7 +926,10 @@ - } - - pa_context_set_state_callback(context, context_state_callback, NULL); -- pa_context_connect(context, server, 0, NULL); -+ if (pa_context_connect(context, server, 0, NULL) < 0) { -+ fprintf(stderr, _("pa_context_connect() failed: %s"), pa_strerror(pa_context_errno(context))); -+ goto quit; -+ } - - if (pa_mainloop_run(m, &ret) < 0) { - fprintf(stderr, _("pa_mainloop_run() failed.\n")); -Index: pulseaudio-0.9.14/src/pulsecore/protocol-native.c -=================================================================== ---- src/pulsecore/protocol-native.c 2009-02-19 19:25:10.000000000 -0500 -+++ src/pulsecore/protocol-native.c 2009-02-19 19:25:11.000000000 -0500 -@@ -2472,7 +2472,10 @@ - if (!(name = pa_proplist_gets(p, PA_PROP_EVENT_ID))) - name = pa_proplist_gets(p, PA_PROP_MEDIA_NAME); - -- CHECK_VALIDITY(c->pstream, name && pa_namereg_is_valid_name(name), tag, PA_ERR_INVALID); -+ if (!name || !pa_namereg_is_valid_name(name)) { -+ pa_proplist_free(p); -+ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); -+ } - - s = upload_stream_new(c, &ss, &map, name, length, p); - pa_proplist_free(p); -@@ -3426,24 +3429,29 @@ - } - } - -- CHECK_VALIDITY(c->pstream, mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE, tag, PA_ERR_INVALID); -+ if (!(mode == PA_UPDATE_SET || mode == PA_UPDATE_MERGE || mode == PA_UPDATE_REPLACE)) { -+ pa_proplist_free(p); -+ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_INVALID); + void pa_source_detach(pa_source *s); + void pa_source_attach(pa_source *s); +From c73733777f11080373264ed4e992c6860809898e Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Fri, 8 May 2009 02:02:36 +0200 +Subject: [PATCH 25/28] core: cache requested latency only when we are running, not while we are still constructing + +--- + src/pulsecore/sink.c | 7 +++++-- + src/pulsecore/source.c | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git src/pulsecore/sink.c src/pulsecore/sink.c +index 2225886..161b7c9 100644 +--- src/pulsecore/sink.c ++++ src/pulsecore/sink.c +@@ -1867,8 +1867,11 @@ pa_usec_t pa_sink_get_requested_latency_within_thread(pa_sink *s) { + if (result != (pa_usec_t) -1) + result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency); + +- s->thread_info.requested_latency = result; +- s->thread_info.requested_latency_valid = TRUE; ++ if (PA_SINK_IS_LINKED(s->thread_info.state)) { ++ /* Only cache if properly initialized */ ++ s->thread_info.requested_latency = result; ++ s->thread_info.requested_latency_valid = TRUE; + } - if (command == PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST) { - playback_stream *s; - - s = pa_idxset_get_by_index(c->output_streams, idx); -- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY); -- CHECK_VALIDITY(c->pstream, playback_stream_isinstance(s), tag, PA_ERR_NOENTITY); -- -+ if (!s || !playback_stream_isinstance(s)) { -+ pa_proplist_free(p); -+ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); -+ } - pa_proplist_update(s->sink_input->proplist, mode, p); - pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->sink_input->index); - - } else if (command == PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST) { - record_stream *s; - -- s = pa_idxset_get_by_index(c->record_streams, idx); -- CHECK_VALIDITY(c->pstream, s, tag, PA_ERR_NOENTITY); -- -+ if (!(s = pa_idxset_get_by_index(c->record_streams, idx))) { -+ pa_proplist_free(p); -+ CHECK_VALIDITY(c->pstream, FALSE, tag, PA_ERR_NOENTITY); -+ } - pa_proplist_update(s->source_output->proplist, mode, p); - pa_subscription_post(c->protocol->core, PA_SUBSCRIPTION_EVENT_SOURCE_OUTPUT|PA_SUBSCRIPTION_EVENT_CHANGE, s->source_output->index); - } else { -@@ -3454,6 +3462,7 @@ - } - - pa_pstream_send_simple_ack(c->pstream, tag); -+ pa_proplist_free(p); + return result; } +diff --git src/pulsecore/source.c src/pulsecore/source.c +index e8deaf7..8a4c8c4 100644 +--- src/pulsecore/source.c ++++ src/pulsecore/source.c +@@ -1122,8 +1122,11 @@ pa_usec_t pa_source_get_requested_latency_within_thread(pa_source *s) { + if (result != (pa_usec_t) -1) + result = PA_CLAMP(result, s->thread_info.min_latency, s->thread_info.max_latency); + +- s->thread_info.requested_latency = result; +- s->thread_info.requested_latency_valid = TRUE; ++ if (PA_SOURCE_IS_LINKED(s->thread_info.state)) { ++ /* Only cache this if we are fully set up */ ++ s->thread_info.requested_latency = result; ++ s->thread_info.requested_latency_valid = TRUE; ++ } - static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { -@@ -4034,7 +4043,7 @@ - CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID); - - cb = (pa_native_protocol_ext_cb_t) pa_hashmap_get(c->protocol->extensions, m); -- CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION); -+ CHECK_VALIDITY(c->pstream, cb, tag, PA_ERR_NOEXTENSION); - - if (cb(c->protocol, m, c, tag, t) < 0) - protocol_error(c); -Index: pulseaudio-0.9.14/src/utils/padsp.c -=================================================================== ---- src/utils/padsp.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/utils/padsp.c 2009-02-19 19:25:11.000000000 -0500 -@@ -1202,7 +1202,7 @@ - static void sink_info_cb(pa_context *context, const pa_sink_info *si, int eol, void *userdata) { - fd_info *i = userdata; - -- if (!si && eol < 0) { -+ if (!si || eol < 0) { - i->operation_success = 0; - pa_threaded_mainloop_signal(i->mainloop, 0); - return; -@@ -1224,7 +1224,7 @@ - static void source_info_cb(pa_context *context, const pa_source_info *si, int eol, void *userdata) { - fd_info *i = userdata; - -- if (!si && eol < 0) { -+ if (!si || eol < 0) { - i->operation_success = 0; - pa_threaded_mainloop_signal(i->mainloop, 0); - return; -Index: pulseaudio-0.9.14/src/pulsecore/core-util.c -=================================================================== ---- src/pulsecore/core-util.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/pulsecore/core-util.c 2009-02-19 19:26:05.000000000 -0500 -@@ -1376,6 +1376,7 @@ - return -1; - } - -+ pa_xfree(p); - return 0; + return result; } - -@@ -1408,6 +1409,7 @@ - - if (pa_make_secure_dir(d, m, (uid_t) -1, (gid_t) -1) < 0) { - pa_log_error("Failed to create secure directory: %s", pa_cstrerror(errno)); -+ pa_xfree(d); - goto fail; - } - -@@ -2424,7 +2426,7 @@ - - pa_strip_nl(ln); - -- if (ln[0]) -+ if (r && ln[0]) - return pa_xstrdup(ln); - } - -Index: pulseaudio-0.9.14/src/daemon/daemon-conf.c -=================================================================== ---- src/daemon/daemon-conf.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/daemon/daemon-conf.c 2009-02-19 19:25:11.000000000 -0500 -@@ -643,7 +643,7 @@ - if (c->config_file) - pa_strbuf_printf(s, _("### Read from configuration file: %s ###\n"), c->config_file); - -- pa_assert(c->log_level <= PA_LOG_LEVEL_MAX); -+ pa_assert(c->log_level < PA_LOG_LEVEL_MAX); - - pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize)); - pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail)); -Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c -=================================================================== ---- src/pulsecore/protocol-esound.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/pulsecore/protocol-esound.c 2009-02-19 19:25:11.000000000 -0500 -@@ -926,7 +926,7 @@ - - c->request = PA_MAYBE_INT32_SWAP(c->swap_byte_order, c->request); - -- if (c->request < ESD_PROTO_CONNECT || c->request > ESD_PROTO_MAX) { -+ if (c->request < ESD_PROTO_CONNECT || c->request >= ESD_PROTO_MAX) { - pa_log("recieved invalid request."); - return -1; - } -Index: pulseaudio-0.9.14/src/modules/module-stream-restore.c +From 85fb360fe3b9d3b3fb4e537373f4dc9202ca5e13 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lennart@poettering.net> +Date: Mon, 8 Jun 2009 18:22:19 +0200 +Subject: [PATCH 26/28] sample: fix build on BE archs + +--- + src/pulsecore/sample-util.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git src/pulsecore/sample-util.c src/pulsecore/sample-util.c +index dda3883..5b8ccf5 100644 +--- src/pulsecore/sample-util.c ++++ src/pulsecore/sample-util.c +@@ -1182,7 +1182,7 @@ pa_memchunk* pa_silence_memchunk_get(pa_silence_cache *cache, pa_mempool *pool, + case PA_SAMPLE_S24LE: + case PA_SAMPLE_S24BE: + case PA_SAMPLE_S24_32LE: +- case PA_SAMPLE_S24_32RE: ++ case PA_SAMPLE_S24_32BE: + case PA_SAMPLE_FLOAT32LE: + case PA_SAMPLE_FLOAT32BE: + cache->blocks[PA_SAMPLE_S16LE] = b = silence_memblock_new(pool, 0); +Index: pulseaudio-0.9.14/src/daemon/daemon.conf.in =================================================================== ---- src/modules/module-stream-restore.c 2009-02-19 19:25:01.000000000 -0500 -+++ src/modules/module-stream-restore.c 2009-02-19 19:25:11.000000000 -0500 -@@ -429,6 +429,7 @@ - pa_xfree(n); - continue; - } -+ pa_xfree(n); +--- src/daemon/daemon.conf.in 2009-03-07 05:01:11.000000000 -0500 ++++ src/daemon/daemon.conf.in 2009-03-07 05:01:54.000000000 -0500 +@@ -46,7 +46,7 @@ + ; log-target = auto + ; log-level = notice - if (u->restore_volume) { - pa_cvolume v = e->volume; -@@ -460,6 +461,7 @@ - pa_xfree(n); - continue; - } -+ pa_xfree(n); +-; resample-method = speex-float-3 ++resample-method = speex-float-1 + ; disable-remixing = no + ; disable-lfe-remixing = yes - if (u->restore_device && - (s = pa_namereg_get(u->core, e->device, PA_NAMEREG_SOURCE, TRUE))) { -Index: pulseaudio-0.9.14/src/modules/alsa-util.c -=================================================================== ---- src/modules/alsa-util.c 2009-02-19 19:28:55.000000000 -0500 -+++ src/modules/alsa-util.c 2009-02-19 19:29:23.000000000 -0500 -@@ -107,7 +107,7 @@ - static void defer_cb(pa_mainloop_api*a, pa_defer_event* e, void *userdata) { - struct pa_alsa_fdlist *fdl = userdata; - unsigned num_fds, i; -- int err; -+ int err, n; - struct pollfd *temp; - - pa_assert(a); -@@ -116,7 +116,11 @@ - - a->defer_enable(fdl->defer, 0); - -- num_fds = (unsigned) snd_mixer_poll_descriptors_count(fdl->mixer); -+ if ((n = snd_mixer_poll_descriptors_count(fdl->mixer)) < 0) { -+ pa_log("snd_mixer_poll_descriptors_count() failed: %s", snd_strerror(n)); -+ return; -+ } -+ num_fds = (unsigned) n; +@@ -72,5 +72,5 @@ + ; default-sample-rate = 44100 + ; default-sample-channels = 2 - if (num_fds != fdl->num_fds) { - if (fdl->fds) -Index: pulseaudio-0.9.14/src/daemon/cmdline.c -=================================================================== ---- src/daemon/cmdline.c 2009-02-22 00:19:36.000000000 -0500 -+++ src/daemon/cmdline.c 2009-02-22 00:21:01.000000000 -0500 -@@ -292,7 +292,7 @@ - - case ARG_DISALLOW_EXIT: - if ((conf->disallow_exit = optarg ? pa_parse_boolean(optarg) : TRUE) < 0) { -- pa_log(_("--disallow-exit boolean argument")); -+ pa_log(_("--disallow-exit expects boolean argument")); - goto fail; - } - break; -Index: pulseaudio-0.9.14/src/pulsecore/protocol-esound.c -=================================================================== ---- src/pulsecore/protocol-esound.c 2009-03-05 17:15:48.000000000 -0500 -+++ src/pulsecore/protocol-esound.c 2009-03-05 17:15:49.000000000 -0500 -@@ -1198,6 +1198,9 @@ - connection *c = CONNECTION(o); - connection_assert_ref(c); - -+ if (!c->protocol) -+ return -1; -+ - switch (code) { - case CONNECTION_MESSAGE_REQUEST_DATA: - do_work(c); -Index: pulseaudio-0.9.14/src/pulsecore/protocol-simple.c +-; default-fragments = 4 +-; default-fragment-size-msec = 25 ++default-fragments = 8 ++default-fragment-size-msec = 10 =================================================================== ---- src/pulsecore/protocol-simple.c 2009-03-05 17:12:00.000000000 -0500 -+++ src/pulsecore/protocol-simple.c 2009-03-05 17:15:49.000000000 -0500 -@@ -283,6 +283,9 @@ - connection *c = CONNECTION(o); - connection_assert_ref(c); - -+ if (!c->protocol) -+ return -1; -+ - switch (code) { - case CONNECTION_MESSAGE_REQUEST_DATA: - do_work(c); +--- src/daemon/default.pa.in 2009-02-13 19:12:33.000000000 -0500 ++++ src/daemon/default.pa.in 2009-02-13 19:13:03.000000000 -0500 +@@ -58,7 +58,7 @@ + + ### Automatically load driver modules depending on the hardware available + .ifexists module-hal-detect@PA_SOEXT@ +-load-module module-hal-detect ++load-module module-hal-detect tsched=0 + .else + ### Alternatively use the static hardware detection module (for systems that + ### lack HAL support) diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist index d84110daef1b..e6c39d46b70f 100644 --- a/audio/pulseaudio/pkg-plist +++ b/audio/pulseaudio/pkg-plist @@ -67,84 +67,141 @@ lib/libpulse.a lib/libpulse.la lib/libpulse.so lib/libpulse.so.0 -lib/libpulsecore.a -lib/libpulsecore.la -lib/libpulsecore.so -lib/libpulsecore.so.9 +lib/libpulsecommon-%%PULSE_VERSION%%.a +lib/libpulsecommon-%%PULSE_VERSION%%.la +lib/libpulsecommon-%%PULSE_VERSION%%.so +lib/libpulsecore-%%PULSE_VERSION%%.a +lib/libpulsecore-%%PULSE_VERSION%%.la +lib/libpulsecore-%%PULSE_VERSION%%.so +lib/libpulsedsp.a lib/libpulsedsp.so -lib/pulse-%%PULSE_VERSION%%/modules/libauth-cookie.so -lib/pulse-%%PULSE_VERSION%%/modules/libauthkey.so +%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so +lib/pulse-%%PULSE_VERSION%%/modules/libcli.a lib/pulse-%%PULSE_VERSION%%/modules/libcli.so -%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/libdbus-util.so -lib/pulse-%%PULSE_VERSION%%/modules/libiochannel.so -lib/pulse-%%PULSE_VERSION%%/modules/libioline.so -lib/pulse-%%PULSE_VERSION%%/modules/libipacl.so +lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.so -lib/pulse-%%PULSE_VERSION%%/modules/libpacket.so -lib/pulse-%%PULSE_VERSION%%/modules/libparseaddr.so -lib/pulse-%%PULSE_VERSION%%/modules/libpdispatch.so +lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.a lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-cli.so +lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.a lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-esound.so +lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.a lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-http.so +lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.a lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-native.so +lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.a lib/pulse-%%PULSE_VERSION%%/modules/libprotocol-simple.so -lib/pulse-%%PULSE_VERSION%%/modules/libpstream-util.so -lib/pulse-%%PULSE_VERSION%%/modules/libpstream.so +lib/pulse-%%PULSE_VERSION%%/modules/libraop.a +lib/pulse-%%PULSE_VERSION%%/modules/libraop.so +lib/pulse-%%PULSE_VERSION%%/modules/librtp.a lib/pulse-%%PULSE_VERSION%%/modules/librtp.so -lib/pulse-%%PULSE_VERSION%%/modules/libsocket-client.so -lib/pulse-%%PULSE_VERSION%%/modules/libsocket-server.so -lib/pulse-%%PULSE_VERSION%%/modules/libsocket-util.so -lib/pulse-%%PULSE_VERSION%%/modules/libstrlist.so -lib/pulse-%%PULSE_VERSION%%/modules/libtagstruct.so -lib/pulse-%%PULSE_VERSION%%/modules/libx11prop.so -lib/pulse-%%PULSE_VERSION%%/modules/libx11wrap.so +lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-always-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.a +lib/pulse-%%PULSE_VERSION%%/modules/module-augment-properties.so +lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.a +lib/pulse-%%PULSE_VERSION%%/modules/module-card-restore.so +lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-tcp.so +lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-cli-protocol-unix.so +lib/pulse-%%PULSE_VERSION%%/modules/module-cli.a lib/pulse-%%PULSE_VERSION%%/modules/module-cli.so +lib/pulse-%%PULSE_VERSION%%/modules/module-combine.a lib/pulse-%%PULSE_VERSION%%/modules/module-combine.so +lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.a lib/pulse-%%PULSE_VERSION%%/modules/module-console-kit.so +lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.a +lib/pulse-%%PULSE_VERSION%%/modules/module-cork-music-on-phone.so +lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-default-device-restore.so +lib/pulse-%%PULSE_VERSION%%/modules/module-detect.a lib/pulse-%%PULSE_VERSION%%/modules/module-detect.so +lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-device-restore.so +lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnfd.so +lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-compat-spawnpid.so +lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-tcp.so +lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-protocol-unix.so +lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-esound-sink.so +%%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.a %%GCONF%%lib/pulse-%%PULSE_VERSION%%/modules/module-gconf.so +%%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.a %%HAL%%lib/pulse-%%PULSE_VERSION%%/modules/module-hal-detect.so +lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-tcp.so +lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-http-protocol-unix.so +%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.a %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-sink.so +%%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.a %%JACK%%lib/pulse-%%PULSE_VERSION%%/modules/module-jack-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-ladspa-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-match.a lib/pulse-%%PULSE_VERSION%%/modules/module-match.so +lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.a lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-fd.so +lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-tcp.so +lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-native-protocol-unix.so +lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-null-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-oss.a lib/pulse-%%PULSE_VERSION%%/modules/module-oss.so +lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.a lib/pulse-%%PULSE_VERSION%%/modules/module-pipe-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.a lib/pulse-%%PULSE_VERSION%%/modules/module-position-event-sounds.so +lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.a +lib/pulse-%%PULSE_VERSION%%/modules/module-raop-discover.so +lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.a +lib/pulse-%%PULSE_VERSION%%/modules/module-raop-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-remap-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.a lib/pulse-%%PULSE_VERSION%%/modules/module-rescue-streams.so +lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.a lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-recv.so +lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.a lib/pulse-%%PULSE_VERSION%%/modules/module-rtp-send.so +lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.a lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-tcp.so +lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.a lib/pulse-%%PULSE_VERSION%%/modules/module-simple-protocol-unix.so +lib/pulse-%%PULSE_VERSION%%/modules/module-sine.a lib/pulse-%%PULSE_VERSION%%/modules/module-sine.so +lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.a +lib/pulse-%%PULSE_VERSION%%/modules/module-sine-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-stream-restore.so +lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.a lib/pulse-%%PULSE_VERSION%%/modules/module-suspend-on-idle.so +lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.a lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-sink.so +lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.a lib/pulse-%%PULSE_VERSION%%/modules/module-tunnel-source.so +lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.a lib/pulse-%%PULSE_VERSION%%/modules/module-volume-restore.so +lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.a lib/pulse-%%PULSE_VERSION%%/modules/module-x11-bell.so +lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.a +lib/pulse-%%PULSE_VERSION%%/modules/module-x11-cork-request.so +lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.a lib/pulse-%%PULSE_VERSION%%/modules/module-x11-publish.so +lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.a lib/pulse-%%PULSE_VERSION%%/modules/module-x11-xsmp.so +%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.a %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-discover.so +%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.a %%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/module-zeroconf-publish.so %%AVAHI%%libdata/pkgconfig/libpulse-browse.pc libdata/pkgconfig/libpulse-mainloop-glib.pc @@ -152,12 +209,40 @@ libdata/pkgconfig/libpulse-simple.pc libdata/pkgconfig/libpulse.pc %%GCONF%%libexec/pulse/gconf-helper %%HAL%%share/PolicyKit/policy/org.pulseaudio.policy +share/locale/as/LC_MESSAGES/pulseaudio.mo +share/locale/bn_IN/LC_MESSAGES/pulseaudio.mo +share/locale/ca/LC_MESSAGES/pulseaudio.mo +share/locale/cs/LC_MESSAGES/pulseaudio.mo share/locale/de/LC_MESSAGES/pulseaudio.mo share/locale/el/LC_MESSAGES/pulseaudio.mo +share/locale/es/LC_MESSAGES/pulseaudio.mo +share/locale/fi/LC_MESSAGES/pulseaudio.mo share/locale/fr/LC_MESSAGES/pulseaudio.mo +share/locale/gu/LC_MESSAGES/pulseaudio.mo +share/locale/it/LC_MESSAGES/pulseaudio.mo +share/locale/kn/LC_MESSAGES/pulseaudio.mo +share/locale/mr/LC_MESSAGES/pulseaudio.mo +share/locale/nl/LC_MESSAGES/pulseaudio.mo +share/locale/or/LC_MESSAGES/pulseaudio.mo +share/locale/pa/LC_MESSAGES/pulseaudio.mo +share/locale/pl/LC_MESSAGES/pulseaudio.mo +share/locale/pt_BR/LC_MESSAGES/pulseaudio.mo +share/locale/sr/LC_MESSAGES/pulseaudio.mo +share/locale/sr@latin/LC_MESSAGES/pulseaudio.mo share/locale/sv/LC_MESSAGES/pulseaudio.mo +share/locale/ta/LC_MESSAGES/pulseaudio.mo +share/locale/te/LC_MESSAGES/pulseaudio.mo +share/locale/zh_CN/LC_MESSAGES/pulseaudio.mo %%GCONF%%@dirrm libexec/pulse @dirrm lib/pulse-%%PULSE_VERSION%%/modules @dirrm lib/pulse-%%PULSE_VERSION%% @dirrm include/pulse @dirrm etc/pulse +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/bn_IN/LC_MESSAGES +@dirrmtry share/locale/bn_IN +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as diff --git a/audio/py-taglib/Makefile b/audio/py-taglib/Makefile index aba6e01f2a6a..b0ae4ed33079 100644 --- a/audio/py-taglib/Makefile +++ b/audio/py-taglib/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= tag.6:${PORTSDIR}/audio/taglib WRKSRC= ${WRKDIR}/python-taglib-${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= -2.4 USE_PYTHON_PREFIX= yes GNU_CONFIGURE= yes diff --git a/audio/resid/Makefile b/audio/resid/Makefile index 08166eb6c8bf..8cec4e720aa1 100644 --- a/audio/resid/Makefile +++ b/audio/resid/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= CRITICAL MAINTAINER= ehaupt@FreeBSD.org COMMENT= Cycle-based SID emulator engine -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile index 2def21a2bf1c..34ae229f38a8 100644 --- a/audio/rhythmbox/Makefile +++ b/audio/rhythmbox/Makefile @@ -33,7 +33,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix gtk20 nautilus2 WANT_GNOME= yes USE_GSTREAMER= flac mp3 gnomevfs gconf jpeg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-vala --with-libbrasero-media \ --without-libnautilus-burn INSTALLS_ICONS= yes diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile index f2ae6eef104f..3202683ce57d 100644 --- a/audio/rioutil/Makefile +++ b/audio/rioutil/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A program to inferface with the Rio600, Rio800, and psa[play devices -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile index 9da37db816ac..fc99855b396b 100644 --- a/audio/sdl_mixer/Makefile +++ b/audio/sdl_mixer/Makefile @@ -15,7 +15,7 @@ DISTNAME= SDL_mixer-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A sample multi-channel audio mixer library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile index 03ad25d1f7d2..8d052ccc0734 100644 --- a/audio/sdl_sound/Makefile +++ b/audio/sdl_sound/Makefile @@ -16,7 +16,7 @@ DISTNAME= SDL_sound-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A SDL audio library and player for some popular sound file formats -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_SDL= sdl CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/soundtouch/Makefile b/audio/soundtouch/Makefile index e2c29d2a919a..4e5a61487a60 100644 --- a/audio/soundtouch/Makefile +++ b/audio/soundtouch/Makefile @@ -15,7 +15,7 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= An open-source audio processing library CONFIGURE_ARGS= --enable-shared=yes -USE_AUTOTOOLS= autoconf:262 automake:19:env libtool:15 +USE_AUTOTOOLS= autoconf:262 automake:19:env libtool:22 USE_LDCONFIG= yes pre-configure: diff --git a/audio/sox/Makefile b/audio/sox/Makefile index b74aef946fac..7ad5b93b401b 100644 --- a/audio/sox/Makefile +++ b/audio/sox/Makefile @@ -7,7 +7,7 @@ PORTNAME= sox PORTVERSION= 14.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 68a30b80b947..b1dea7d27236 100644 --- a/audio/speex/Makefile +++ b/audio/speex/Makefile @@ -21,7 +21,7 @@ CONFLICTS= speex-devel-[0-9]* USE_GNOME= gnomehack gnometarget ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-ogg-dir=${LOCALBASE} diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile index 0b5fade4d2e7..7031d4908ce3 100644 --- a/audio/sphinx/Makefile +++ b/audio/sphinx/Makefile @@ -20,7 +20,7 @@ DEST= ${WRKSRC}/src/libsphinx2/ USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -USE_AUTOTOOLS=libtool:15 +USE_AUTOTOOLS=libtool:22 # contains i386 sound code ONLY_FOR_ARCHS= i386 diff --git a/audio/sphinx3/Makefile b/audio/sphinx3/Makefile index 0071c4f3f370..d3ec55f2ae6b 100644 --- a/audio/sphinx3/Makefile +++ b/audio/sphinx3/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= sphinxfe.0:${PORTSDIR}/audio/sphinxbase USE_LDCONFIG= yes USE_GMAKE= yes -USE_AUTOTOOLS=libtool:15 +USE_AUTOTOOLS=libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/sphinxbase" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/audio/sphinxbase/Makefile b/audio/sphinxbase/Makefile index 0cb09061b8ef..c27e8bfb1735 100644 --- a/audio/sphinxbase/Makefile +++ b/audio/sphinxbase/Makefile @@ -7,6 +7,7 @@ PORTNAME= sphinxbase PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= audio accessibility MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cmusphinx @@ -17,7 +18,8 @@ COMMENT= CMU SPhinx Speech recognition system base USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 automake:19 +USE_GNOME= gnomehack +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -25,7 +27,4 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAKE_ENV= MKDIR="${MKDIR}" \ OSVERSION=${OSVERSION} -post-patch: - @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am - .include <bsd.port.mk> diff --git a/audio/sphinxbase/files/patch-configure.in b/audio/sphinxbase/files/patch-configure index bba277a6037e..f536d39e1773 100644 --- a/audio/sphinxbase/files/patch-configure.in +++ b/audio/sphinxbase/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.in (revision 7550) -+++ configure.in (working copy) -@@ -105,18 +105,12 @@ +--- configure.orig 2009-07-13 10:53:01.000000000 -0500 ++++ configure 2009-07-13 10:54:06.000000000 -0500 +@@ -7166,7 +7166,8 @@ if test "x$ad_files" = "x"; then case $host in @@ -9,14 +9,21 @@ + *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) ad_files="ad_oss.lo" ad_backend="AD_BACKEND_OSS" - AC_DEFINE(AD_BACKEND_OSS, [], [Use OSS interface for sound I/O]) + +@@ -7175,17 +7176,6 @@ + _ACEOF + ;; - # FIXME: isn't this the same OSS as on Linux? - *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) - ad_files="ad_oss_bsd.lo mulaw_base.lo" - ad_libs="-lossaudio" - ad_backend="AD_BACKEND_OSS_BSD" -- AC_DEFINE(AD_BACKEND_OSS_BSD, [], [Use OSS interface for sound I/O]) +- +-cat >>confdefs.h <<\_ACEOF +-#define AD_BACKEND_OSS_BSD +-_ACEOF +- - ;; *-*-osf*) ad_files="ad_osf.lo mulaw_base.lo" diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile index 19aa8589034c..00862c527ede 100644 --- a/audio/sweep/Makefile +++ b/audio/sweep/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnometarget gtk20 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \ diff --git a/audio/swhplugins/Makefile b/audio/swhplugins/Makefile index 52b636ea6298..226e23bee77b 100644 --- a/audio/swhplugins/Makefile +++ b/audio/swhplugins/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= fftw3f.5:${PORTSDIR}/math/fftw3-float # includes assembler code ONLY_FOR_ARCHS= i386 amd64 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CPPFLAGS= -I${LOCALBASE}/include diff --git a/audio/taglib/Makefile b/audio/taglib/Makefile index f972a635dade..6873ad1384ee 100644 --- a/audio/taglib/Makefile +++ b/audio/taglib/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://ktown.kde.org/~wheeler/files/src/ MAINTAINER= bsdkaffee@gmail.com COMMENT= Library for manipulating ID3 tags and Ogg comments -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile index 745bc6f46629..c8c5967a9a8a 100644 --- a/audio/thunar-media-tags-plugin/Makefile +++ b/audio/thunar-media-tags-plugin/Makefile @@ -24,6 +24,6 @@ USE_GETTEXT= yes GNU_CONFIGURE= yes USE_GNOME= gnometarget gnomehack gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libexo thunar -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/audio/tse3/Makefile b/audio/tse3/Makefile index ff75a5eb8d25..483daab7040b 100644 --- a/audio/tse3/Makefile +++ b/audio/tse3/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A MIDI library USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --without-doc-install CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/audio/vagalume/Makefile b/audio/vagalume/Makefile index 5f0ad7c7ef72..987cb0451100 100644 --- a/audio/vagalume/Makefile +++ b/audio/vagalume/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 autoconf:262 +USE_AUTOTOOLS= libtool:22 autoconf:262 USE_GNOME= pkgconfig gtk20 USE_GSTREAMER= good mad INSTALLS_ICONS= yes diff --git a/audio/vsound/Makefile b/audio/vsound/Makefile index 0c40b5c91a5f..8da7c3bef845 100644 --- a/audio/vsound/Makefile +++ b/audio/vsound/Makefile @@ -17,7 +17,7 @@ COMMENT= Utility for capturing audio streams from programs with OSS output BUILD_DEPENDS= sox:${PORTSDIR}/audio/sox RUN_DEPENDS= sox:${PORTSDIR}/audio/sox -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-install: .if !defined(NOPORTDOCS) diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 2f7525c451de..39add0ba2390 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \ dockapp.2:${PORTSDIR}/x11-wm/libdockapp RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WANT_GNOME= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/audio/xanalyser/Makefile b/audio/xanalyser/Makefile index f3818464e70b..30934a68ce87 100644 --- a/audio/xanalyser/Makefile +++ b/audio/xanalyser/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_MOTIF= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= xanalyser.1 PLIST_FILES= bin/xanalyser \ lib/X11/app-defaults/XAnalyser diff --git a/audio/xmms-arts_output/Makefile b/audio/xmms-arts_output/Makefile index 7cc3974e9951..20e239ed1a30 100644 --- a/audio/xmms-arts_output/Makefile +++ b/audio/xmms-arts_output/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ artsc.0:${PORTSDIR}/audio/arts USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes PLIST_FILES= lib/xmms/Output/libarts.a \ lib/xmms/Output/libarts.la \ diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile index 81b2e3ac62ba..3ae842d12229 100644 --- a/audio/xmms-flac/Makefile +++ b/audio/xmms-flac/Makefile @@ -18,7 +18,7 @@ COMMENT= XMMS input plugin for playing FLAC files LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms \ FLAC.10:${PORTSDIR}/audio/flac -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-libiconv-prefix="${LOCALBASE}" \ --with-ogg="${LOCALBASE}" \ --with-xmms-prefix="${LOCALBASE}" diff --git a/audio/xmms-jack/Makefile b/audio/xmms-jack/Makefile index 737e295b21e9..87c04f2b288b 100644 --- a/audio/xmms-jack/Makefile +++ b/audio/xmms-jack/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gtk12 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= lib/xmms/Output/libjackout.so diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile index 36240631471e..6ab1c85058bc 100644 --- a/audio/xmms-kde/Makefile +++ b/audio/xmms-kde/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= id3-3.8.3:${PORTSDIR}/audio/id3lib \ USE_KDELIBS_VER= 3 USE_GNOME= gtk12 gnometarget USE_SDL= sdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-xmms-prefix=${LOCALBASE} \ --with-smpeg-prefix=${LOCALBASE} \ --with-vorbis-prefix=${LOCALBASE} \ diff --git a/audio/xmms-midi/Makefile b/audio/xmms-midi/Makefile index 0c23aa1b8774..40192ece52d6 100644 --- a/audio/xmms-midi/Makefile +++ b/audio/xmms-midi/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes PLIST_FILES= lib/xmms/Input/libmid.a \ diff --git a/audio/xmms-sndfile/Makefile b/audio/xmms-sndfile/Makefile index 68cd592c5228..334e14eb499c 100644 --- a/audio/xmms-sndfile/Makefile +++ b/audio/xmms-sndfile/Makefile @@ -26,7 +26,7 @@ PLIST_FILES= lib/xmms/Input/libxmms_sndfile.so \ lib/xmms/Input/libxmms_sndfile.la USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_XORG= x11 xext xmu xi USE_LDCONFIG= yes diff --git a/audio/xmms-tfmx/Makefile b/audio/xmms-tfmx/Makefile index 2603297a9364..a82be1351947 100644 --- a/audio/xmms-tfmx/Makefile +++ b/audio/xmms-tfmx/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms USE_GNOME= gnometarget gtk12 lthack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PLIST_FILES= lib/xmms/Input/libtfmx.so diff --git a/audio/xsynth-dssi/Makefile b/audio/xsynth-dssi/Makefile index fbc8e3bb717c..044a8e07d197 100644 --- a/audio/xsynth-dssi/Makefile +++ b/audio/xsynth-dssi/Makefile @@ -24,6 +24,6 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gtk20 CFLAGS+= -I${LOCALBASE}/include/dssi -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/audio/yammi/Makefile b/audio/yammi/Makefile index d45e2e5f8b39..903c5a535f09 100644 --- a/audio/yammi/Makefile +++ b/audio/yammi/Makefile @@ -22,7 +22,7 @@ OPTIONS= XMMS "XMMS backend support" off USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15 +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gstreamer diff --git a/benchmarks/sysbench/Makefile b/benchmarks/sysbench/Makefile index 49b45abe161d..9b0fadef8827 100644 --- a/benchmarks/sysbench/Makefile +++ b/benchmarks/sysbench/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= kris@FreeBSD.org COMMENT= A modular, cross-platform and multi-threaded benchmark tool -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 OPTIONS= LARGEFILE "Enable Largefile support" on \ MYSQL "Enable MySQL support" on \ diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile index 6abea60a03f6..408a6189025e 100644 --- a/biology/emboss/Makefile +++ b/biology/emboss/Makefile @@ -30,7 +30,7 @@ NO_MTREE= yes USE_SUBMAKE= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_MOTIF= yes SUB_FILES= pkg-message diff --git a/biology/libgenome/Makefile b/biology/libgenome/Makefile index f27daef37562..3258fd92d482 100644 --- a/biology/libgenome/Makefile +++ b/biology/libgenome/Makefile @@ -16,7 +16,7 @@ DISTNAME= libGenome-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Toolkit for developing bioinformatic related software in C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index a75886b73a8b..d2f260fe9602 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/tnt/jama_lu.h:${PORTSDIR}/math/jama LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ rle.1:${PORTSDIR}/graphics/urt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GL= gl USE_XORG= x11 xt xi xproto xext inputproto diff --git a/cad/fandango/Makefile b/cad/fandango/Makefile index 71fada28ba61..c0a5b84bc706 100644 --- a/cad/fandango/Makefile +++ b/cad/fandango/Makefile @@ -23,7 +23,7 @@ USE_GL= yes USE_GNOME= gnometarget USE_GETTEXT= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LDFLAGS+= -lGL CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" INSTALLS_ICONS= yes diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile index 60201b2e4800..7617381be596 100644 --- a/cad/freehdl/Makefile +++ b/cad/freehdl/Makefile @@ -18,7 +18,7 @@ USE_LDCONFIG= yes USE_PERL5= yes USE_GNOME= gnomehack \ pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 HAS_CONFIGURE= yes MAN1= freehdl-config.1 \ diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile index 90ecd39c06ba..4e8dcc14beb2 100644 --- a/cad/gerbv/Makefile +++ b/cad/gerbv/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Free Gerber Viewer USE_GNOME= desktopfileutils gnomehack gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 703f97e29376..d780839cae4d 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -19,7 +19,7 @@ COMMENT= Electronic Waveform Viewer LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index f9a58311ab3d..1a9d60853770 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -50,7 +50,7 @@ LIB_TCLX= ${LOCALBASE}/lib/tclx${TCL_VER}/libtclx${TCL_VER}.so PATCH_WRKSRC= ${WRKDIR}/OpenCASCADE${PORTVERSION}.0 WRKSRC= ${PATCH_WRKSRC}/ros REINPLACE_ARGS= -i "" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= ros/configure CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile index 69e6ca5100d0..22a322a7b35b 100644 --- a/cad/tclspice/Makefile +++ b/cad/tclspice/Makefile @@ -7,7 +7,7 @@ PORTNAME= tclspice PORTVERSION= 0.2.18 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tclspice @@ -17,10 +17,11 @@ COMMENT= Improved version on SPICE3 suite with TCL scripting features BUILD_DEPENDS= bltwish:${PORTSDIR}/x11-toolkits/blt \ ${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= bltwish:${PORTSDIR}/x11-toolkits/blt \ + ${LOCALBASE}/lib/libtclreadline.so:${PORTSDIR}/devel/tclreadline WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:22 AUTOMAKE_ARGS= -c -a USE_GMAKE= yes ALL_TARGET= tcl @@ -34,7 +35,7 @@ OPTIONS= EXPERIMENTAL "Enable experimental features" on \ CONFIGURE_ARGS= --with-tcl=${LOCALBASE}/lib/tcl8.4 CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS} -fPIC" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib -ltcl84 -lBLT24" ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal WISH= ${LOCALBASE}/bin/wish8.4 diff --git a/chinese/iiimf-le-newpy/Makefile b/chinese/iiimf-le-newpy/Makefile index 72086ace3cdc..516852250302 100644 --- a/chinese/iiimf-le-newpy/Makefile +++ b/chinese/iiimf-le-newpy/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/chinese/iiimf-le-ude/Makefile b/chinese/iiimf-le-ude/Makefile index a57afede30e0..54e868445b0a 100644 --- a/chinese/iiimf-le-ude/Makefile +++ b/chinese/iiimf-le-ude/Makefile @@ -22,7 +22,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/chinese/iiimf-le-xcin/Makefile b/chinese/iiimf-le-xcin/Makefile index e3fc4243319e..b8d6d06800b6 100644 --- a/chinese/iiimf-le-xcin/Makefile +++ b/chinese/iiimf-le-xcin/Makefile @@ -22,7 +22,7 @@ USE_XORG= x11 xproto WRKSRC= ${WRKDIR}/iiimf-xcin USE_BZIP2= yes USE_GNOME= libxml2 -USE_AUTOTOOLS= automake:19 autoheader:262 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:19 autoheader:262 autoconf:262 libtool:22 AUTOMAKE_ARGS= --add-missing do-extract: diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile index e5b7e3c466c3..70bee3c8485a 100644 --- a/chinese/scim-pinyin/Makefile +++ b/chinese/scim-pinyin/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} USE_GNOME= gnomehack lthack USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ diff --git a/chinese/wenju/Makefile b/chinese/wenju/Makefile index 6c728fc5b961..86fa999188f1 100644 --- a/chinese/wenju/Makefile +++ b/chinese/wenju/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= chinsan@FreeBSD.org COMMENT= Collection of writing tools in Chinese -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 USE_LDCONFIG= yes diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index ef120a0ce312..0d5cee1f0ac3 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= ao:${PORTSDIR}/audio/libao USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= autoconf:262 automake:110 libtool:22 CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" USE_GMAKE= yes diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile index ab38b6aba2d1..28f56cd85862 100644 --- a/comms/ghfaxviewer/Makefile +++ b/comms/ghfaxviewer/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gconf gnomeprint -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index ed306c164a95..4a43d07d3671 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -31,7 +31,7 @@ USE_PYTHON= 2.4+ USE_WX= 2.6+ WX_COMPS= wx wx:build wx:run python:build python:run USE_PERL5= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile index 8c294ac3eb93..a59dd5619e75 100644 --- a/comms/gsmlib/Makefile +++ b/comms/gsmlib/Makefile @@ -17,7 +17,7 @@ COMMENT= A library to access GSM mobile phones through GSM modems USE_GNOME= gnometarget lthack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index c8bd262ade8d..0336c0847914 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -21,7 +21,7 @@ USE_GNOME= pkgconfig gnomehack libxml2 USE_PERL5= yes USE_TCL= yes USE_PYTHON= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-perl-binding --with-python=${PYTHON_CMD} \ diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile index 1c371ece7414..0a2de5cfaa8e 100644 --- a/comms/kallers/Makefile +++ b/comms/kallers/Makefile @@ -17,7 +17,7 @@ USE_BZIP2= yes USE_KDELIBS_VER= 3 USE_GMAKE= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|@CXXFLAGS@|@CXXFLAGS@ -fPIC|' \ diff --git a/comms/klog/Makefile b/comms/klog/Makefile index 4ae5dd66135b..5cc38b2da6e6 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= hamlib.2:${PORTSDIR}/comms/hamlib USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22:env GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile index 372c8a24dec9..ba946418405d 100644 --- a/comms/kmobiletools/Makefile +++ b/comms/kmobiletools/Makefile @@ -18,7 +18,7 @@ COMMENT= Control mobile phones with your PC USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes .include <bsd.port.mk> diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile index 4e93fbc98f90..7ce848cf853b 100644 --- a/comms/kpsk/Makefile +++ b/comms/kpsk/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-D_POSIX_C_SOURCE -I${LOCALBASE}/include" \ USER_LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-debug=full diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile index e1b5349eb6b9..dace400550bb 100644 --- a/comms/ktrack/Makefile +++ b/comms/ktrack/Makefile @@ -26,7 +26,7 @@ USE_KDEBASE_VER=3 INSTALLS_ICONS= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes post-patch: diff --git a/comms/libsyncml/Makefile b/comms/libsyncml/Makefile index ee316bcdd3d0..64aade612f7e 100644 --- a/comms/libsyncml/Makefile +++ b/comms/libsyncml/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= wbxml2:${PORTSDIR}/textproc/wbxml2 \ openobex:${PORTSDIR}/comms/openobex \ soup-2.2.8:${PORTSDIR}/devel/libsoup22 -USE_AUTOTOOLS= autoheader:262 automake:110 libtool:15 +USE_AUTOTOOLS= autoheader:262 automake:110 libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GNOME= glib20 libxml2 diff --git a/comms/libticables/Makefile b/comms/libticables/Makefile index 78a40cb6c708..0b1622f16360 100644 --- a/comms/libticables/Makefile +++ b/comms/libticables/Makefile @@ -18,7 +18,7 @@ COMMENT= TI calculator link cables library CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GETTEXT= yes USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/comms/libticables2/Makefile b/comms/libticables2/Makefile index d032f3ce2644..7fae9e2f53ee 100644 --- a/comms/libticables2/Makefile +++ b/comms/libticables2/Makefile @@ -18,7 +18,7 @@ COMMENT= TI calculator link cables library LIB_DEPENDS= usb-0.1.8:${PORTSDIR}/devel/libusb -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= glib20 gnomehack pkgconfig USE_LDCONFIG= yes diff --git a/comms/libticalcs2/Makefile b/comms/libticalcs2/Makefile index 72d7c941632e..f4aa3d804cf5 100644 --- a/comms/libticalcs2/Makefile +++ b/comms/libticalcs2/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= ticables2.1:${PORTSDIR}/comms/libticables2 \ ticonv.3:${PORTSDIR}/converters/libticonv \ tifiles2.5:${PORTSDIR}/devel/libtifiles2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= glib20 gnomehack pkgconfig USE_LDCONFIG= yes diff --git a/comms/lirc/Makefile b/comms/lirc/Makefile index 917ab9b1057e..98ba142d266e 100644 --- a/comms/lirc/Makefile +++ b/comms/lirc/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lirc MAINTAINER= doconnor@gsoft.com.au COMMENT= Linux Infared Remote Control -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 diff --git a/comms/spandsp-devel/Makefile b/comms/spandsp-devel/Makefile index f4fb4e3c3b2d..23d38bdbf4af 100644 --- a/comms/spandsp-devel/Makefile +++ b/comms/spandsp-devel/Makefile @@ -20,7 +20,7 @@ COMMENT= A DSP library and software FAX machine LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff WRKSRC= ${WRKDIR}/spandsp-${DISTVERSION:C/pre.*//} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/comms/spandsp-devel5/Makefile b/comms/spandsp-devel5/Makefile index edcb2ea1d13f..581b39e1f145 100644 --- a/comms/spandsp-devel5/Makefile +++ b/comms/spandsp-devel5/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff LATEST_LINK= ${PORTNAME}5 WRKSRC= ${WRKDIR}/spandsp-0.0.5 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/comms/spandsp/Makefile b/comms/spandsp/Makefile index cfe5086a59ff..fb42e0c4bf76 100644 --- a/comms/spandsp/Makefile +++ b/comms/spandsp/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/pre.*$//} USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile index c7f453858d87..e4b8fac35e02 100644 --- a/comms/tilp2/Makefile +++ b/comms/tilp2/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= ticables2.1:${PORTSDIR}/comms/libticables2 \ ticalcs2.7:${PORTSDIR}/comms/libticalcs2 \ ticonv.3:${PORTSDIR}/converters/libticonv -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gtk20 libglade2 diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile index f17116571ff4..a55d59d6dd11 100644 --- a/comms/tlf/Makefile +++ b/comms/tlf/Makefile @@ -17,7 +17,7 @@ MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio curses based logging program WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_AUTOTOOLS= autoconf:262 libtool:15 aclocal:19 automake:19 +USE_AUTOTOOLS= autoconf:262 libtool:22 aclocal:19 automake:19 GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir="${LOCALBASE}/include" \ --libdir="${LOCALBASE}/lib" diff --git a/comms/wsjt/Makefile b/comms/wsjt/Makefile index 2f951a5892b9..c0fdbd969990 100644 --- a/comms/wsjt/Makefile +++ b/comms/wsjt/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS= --with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \ --with-portaudio-lib-dir=${LOCALBASE}/lib/portaudio2 USE_GMAKE= yes USE_PYTHON= 2.4+ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile index 32b3cbfe6a78..2518cfa26b80 100644 --- a/comms/xwota/Makefile +++ b/comms/xwota/Makefile @@ -19,7 +19,7 @@ COMMENT= X version of who is on the air USE_GNOME= gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-install: .if !defined(NOPORTDOCS) diff --git a/converters/enca/Makefile b/converters/enca/Makefile index 20169f7d9b65..bb4b059ff8ee 100644 --- a/converters/enca/Makefile +++ b/converters/enca/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://trific.ath.cx/Ftp/enca/ \ MAINTAINER= never@nevermind.kiev.ua COMMENT= A package for detecting encoding of text files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig USE_ICONV= yes USE_BZIP2= yes diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile index c2c5a22da824..5ee8afc76c12 100644 --- a/converters/ktextdecode/Makefile +++ b/converters/ktextdecode/Makefile @@ -15,7 +15,7 @@ COMMENT= The simple text conversion utility for KDE 3 USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 2b3e0b3bb797..657f2b62dba6 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org COMMENT= A character set conversion library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_CSTD= gnu89 USE_GNOME= gnometarget diff --git a/converters/libticonv/Makefile b/converters/libticonv/Makefile index e647ef011c9b..7f06e9b0ed36 100644 --- a/converters/libticonv/Makefile +++ b/converters/libticonv/Makefile @@ -16,7 +16,7 @@ DISTNAME= tilibs2-20080110 MAINTAINER= tijl@ulyssis.org COMMENT= TI calculator character set library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= glib20 gnomehack pkgconfig USE_LDCONFIG= yes diff --git a/converters/mimelib/Makefile b/converters/mimelib/Makefile index 8b0fe4137c26..8d59982b1c3c 100644 --- a/converters/mimelib/Makefile +++ b/converters/mimelib/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ class library for manipulating messages in MIME format CONFLICTS= kdenetwork-3.1.* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 54b243c8c4ef..921d506c19ba 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://software.frodo.looijaard.name/psiconv/files/ MAINTAINER= gnome@FreeBSD.org COMMENT= A conversion utility to convert Psion 5(MX) files into other formats -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/converters/recode/Makefile b/converters/recode/Makefile index 9d838952ae89..20129cc4ffda 100644 --- a/converters/recode/Makefile +++ b/converters/recode/Makefile @@ -16,7 +16,7 @@ MAINTAINER= demon@FreeBSD.org COMMENT= Converts files between character sets and usages USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --without-included-gettext diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index e4f2e316447c..0dd629f88c5a 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -30,7 +30,7 @@ COUCH_USER?= couchdb USE_RC_SUBR= couchdb USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-erlang=${LOCALBASE}/lib/erlang/usr/include \ --localstatedir=/var \ diff --git a/databases/db42/Makefile.db b/databases/db42/Makefile.db index 3edd9e5ad53a..21ab54139429 100644 --- a/databases/db42/Makefile.db +++ b/databases/db42/Makefile.db @@ -10,7 +10,7 @@ PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME} WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_SCRIPT= ../dist/configure LIBTOOLFILES= ${CONFIGURE_SCRIPT} BDBVER= ${PORTVERSION:R} diff --git a/databases/dbh10/Makefile b/databases/dbh10/Makefile index 72179c200d80..2ba73b0865e6 100644 --- a/databases/dbh10/Makefile +++ b/databases/dbh10/Makefile @@ -18,7 +18,7 @@ COMMENT= Disk Based Hashtables CONFLICTS= dbh-[2-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index 2a5ee02adbb9..58a2d25f99c9 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -30,7 +30,7 @@ USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack \ ltasneededhack USE_OPENLDAP= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BDB= 41+ USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static \ diff --git a/databases/firebird-server/Makefile b/databases/firebird-server/Makefile index e6443e3fdfdf..205a8c7c6788 100644 --- a/databases/firebird-server/Makefile +++ b/databases/firebird-server/Makefile @@ -25,7 +25,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 aclocal:19 libtool:15 +USE_AUTOTOOLS= autoconf:262 aclocal:19 libtool:22 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal USE_GCC= 3.4 diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile index 0af8efcc91a4..7e03ccabda91 100644 --- a/databases/firebird20-server/Makefile +++ b/databases/firebird20-server/Makefile @@ -23,7 +23,7 @@ USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 aclocal:19 libtool:15 +USE_AUTOTOOLS= autoconf:262 aclocal:19 libtool:22 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal \ -I ${WRKSRC}/m4 MAKE_JOBS_UNSAFE= yes diff --git a/databases/firebird20-server/files/patch-libtool22 b/databases/firebird20-server/files/patch-libtool22 new file mode 100644 index 000000000000..47c94dafb599 --- /dev/null +++ b/databases/firebird20-server/files/patch-libtool22 @@ -0,0 +1,11 @@ +--- autogen.sh.orig 2009-07-11 20:59:22.000000000 -0500 ++++ autogen.sh 2009-07-11 20:59:32.000000000 -0500 +@@ -73,7 +73,7 @@ + rm -f aclocal.m4 + cp $LIBTOOL_M4 aclocal.m4 + fi +-$LIBTOOLIZE --copy --force || exit 1 ++$LIBTOOLIZE --copy --force --install || exit 1 + + echo "Running autoheader ..." + $AUTOHEADER || exit 1 diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index b2c61154fec6..4c18b7879955 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -23,7 +23,7 @@ TDS_VER?= 5.0 USE_ICONV= yes USE_GMAKE= yes GNU_GONFIGURE= yes -USE_AUTOTOOLS= autoconf:262:env libtool:15 +USE_AUTOTOOLS= autoconf:262:env libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-tdsver=${TDS_VER} diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 23105ed255f0..bd982cab47de 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -20,7 +20,7 @@ TDS_VER?= 5.0 USE_ICONV= yes USE_GMAKE= yes GNU_GONFIGURE= yes -USE_AUTOTOOLS= autoconf:262:env libtool:15 +USE_AUTOTOOLS= autoconf:262:env libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-tdsver=${TDS_VER} diff --git a/databases/gbib/Makefile b/databases/gbib/Makefile index 06dafc4691ce..8cf202ba7a58 100644 --- a/databases/gbib/Makefile +++ b/databases/gbib/Makefile @@ -17,7 +17,7 @@ COMMENT= Editor/browser for BibTeX bibliographic databases USE_GNOME= gnomelibs USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile index f919f6040fdd..a712d9ef3612 100644 --- a/databases/gdbm/Makefile +++ b/databases/gdbm/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gabor@FreeBSD.org COMMENT= The GNU database manager -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/gdbm/files/patch-libtool22 b/databases/gdbm/files/patch-libtool22 new file mode 100644 index 000000000000..5f6d58758f08 --- /dev/null +++ b/databases/gdbm/files/patch-libtool22 @@ -0,0 +1,20 @@ +--- Makefile.in.orig 2009-06-29 13:15:23.000000000 -0500 ++++ Makefile.in 2009-06-29 13:16:42.000000000 -0500 +@@ -130,7 +130,7 @@ + $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ + $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ + $(INSTALL_ROOT)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ + $(INSTALL_ROOT)$(includedir)/gdbm.h + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +@@ -141,7 +141,7 @@ + install-compat: + $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ + $(INSTALL_ROOT)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ + $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ + $(INSTALL_ROOT)$(includedir)/dbm.h diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile index 6d3a5e9d964f..bac4e330452e 100644 --- a/databases/gigabase/Makefile +++ b/databases/gigabase/Makefile @@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gnometarget USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile index 76a16adaaac0..bd34f16dc059 100644 --- a/databases/gnome-db/Makefile +++ b/databases/gnome-db/Makefile @@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix gnomehier libgda USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile index 58b2d6ac0346..c19be63e372b 100644 --- a/databases/hk_classes/Makefile +++ b/databases/hk_classes/Makefile @@ -24,7 +24,7 @@ USE_GNOME= pkgconfig USE_GETTEXT= yes CXXFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= PYTHON_VERSION=${PYTHON_VERSION:S/python//} LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS+=--with-python-libdir=${PYTHON_LIBDIR} \ --with-python-incdir=${PYTHON_INCLUDEDIR} \ diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index a1273068a300..ea8a882e7ff7 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -16,7 +16,7 @@ COMMENT= BibTeX editor for KDE USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= kbibtex.1 diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile index 73cae4275813..49ee31255048 100644 --- a/databases/keximdb/Makefile +++ b/databases/keximdb/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= kexicore:${PORTSDIR}/editors/koffice-kde3 USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/databases/kmysqladmin/Makefile b/databases/kmysqladmin/Makefile index 502d500d8ccd..42ee88b7feda 100644 --- a/databases/kmysqladmin/Makefile +++ b/databases/kmysqladmin/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.alwins-world.de/programs/download/kmysqladmin/ MAINTAINER= ports@FreeBSD.org COMMENT= A graphical frontend for administration of mysql servers -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes USE_QT_VER= 3 USE_KDELIBS_VER=3 diff --git a/databases/knoda/Makefile b/databases/knoda/Makefile index 5e0177aef58e..e2677b32a836 100644 --- a/databases/knoda/Makefile +++ b/databases/knoda/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_KDELIBS_VER= 3 USE_PYTHON= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --with-hk_classes-dir=${LOCALBASE}/lib/hk_classes \ --with-hk_classes-incdir=${LOCALBASE}/include/hk_classes diff --git a/databases/kpogre/Makefile b/databases/kpogre/Makefile index 22620965c12e..fb921feebe68 100644 --- a/databases/kpogre/Makefile +++ b/databases/kpogre/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpq RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx USE_KDELIBS_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_PGSQL= yes diff --git a/databases/ksqlanalyzer/Makefile b/databases/ksqlanalyzer/Makefile index 21e2b6d8eb3f..0ad880a14205 100644 --- a/databases/ksqlanalyzer/Makefile +++ b/databases/ksqlanalyzer/Makefile @@ -16,7 +16,7 @@ COMMENT= MSSQL database client for KDE WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/databases/ksqlshell/Makefile b/databases/ksqlshell/Makefile index fadc765f68b6..1b24b1889c0a 100644 --- a/databases/ksqlshell/Makefile +++ b/databases/ksqlshell/Makefile @@ -16,7 +16,7 @@ COMMENT= MySQL and PostgreSQL client for KDE WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_MYSQL= yes USE_PGSQL= yes diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index 40198650b70a..b4285be86b46 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -17,7 +17,7 @@ COMMENT= Drivers for libdbi LIB_DEPENDS= dbi.0:${PORTSDIR}/databases/libdbi USE_GNOME= gnometarget lthack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-static \ --with-dbi-incdir=${LOCALBASE}/include/dbi DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile index 274fa7936d02..974f34de1e15 100644 --- a/databases/libdbi/Makefile +++ b/databases/libdbi/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= clsung@FreeBSD.org COMMENT= Database Independent Abstraction Layer for C -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile index 929540f6081b..545a4f8d10ca 100644 --- a/databases/libgda/Makefile +++ b/databases/libgda/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile index 2e1fbf4b3c3c..a4a27d760812 100644 --- a/databases/libgda3/Makefile +++ b/databases/libgda3/Makefile @@ -25,7 +25,7 @@ LIBGDA3_SLAVE?= no LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile index ceb6941e0e17..52ad9ed52db5 100644 --- a/databases/libgda4/Makefile +++ b/databases/libgda4/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ soup-2.4.1:${PORTSDIR}/devel/libsoup \ json-glib-1.0.0:${PORTSDIR}/devel/json-glib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack glib20 libxslt intlhack referencehack diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile index c3ddbf85c478..04ec0e84c7d0 100644 --- a/databases/libgdamm/Makefile +++ b/databases/libgdamm/Makefile @@ -19,7 +19,7 @@ COMMENT= C++ wrapper for libgda4 library LIB_DEPENDS= glibmm-2.4:${PORTSDIR}/devel/glibmm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack libgda4 diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 56de5cf5f71b..6e7145f9d368 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgda3 gtksourceview \ intlhack referencehack diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile index 0d657d7d8e19..d77941a58200 100644 --- a/databases/libiodbc/Makefile +++ b/databases/libiodbc/Makefile @@ -21,7 +21,7 @@ CONFLICTS= unixODBC-[0-9]* USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-iodbc-inidir=${INIDIR} USE_LDCONFIG= yes diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile index 813081614092..c0779a93b2f9 100644 --- a/databases/libmemcache/Makefile +++ b/databases/libmemcache/Makefile @@ -15,7 +15,7 @@ COMMENT= The C library for accessing a memcache cluster USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile index d4a81aeb7161..d5c274bc2569 100644 --- a/databases/libodbc++/Makefile +++ b/databases/libodbc++/Makefile @@ -16,7 +16,7 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= A C++ class library and toolset for ODBC access to data sources USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= --with-isqlxx diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index cdf071777f7f..cac05114429c 100644 --- a/databases/libzdb/Makefile +++ b/databases/libzdb/Makefile @@ -19,7 +19,7 @@ OPTIONS= MYSQL "Add MySQL support" on \ USE_GNOME= gnomehack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/databases/ludia/Makefile b/databases/ludia/Makefile index 1d2fae272f96..9593b42499e3 100644 --- a/databases/ludia/Makefile +++ b/databases/ludia/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/postmaster:${PGSQL_PORT} \ senna-cfg:${PORTSDIR}/textproc/senna GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PGSQL= yes .include <bsd.port.pre.mk> diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index bb8b19ce71eb..ac96f0658ad6 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -17,7 +17,7 @@ COMMENT= Utilities and libraries to export data from MS Access databases (.mdb) # To build man-pages BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build USE_GNOME= glib20 WANT_GNOME= yes diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile index 658ffa45bc5f..d043f4c39acc 100644 --- a/databases/mysql++/Makefile +++ b/databases/mysql++/Makefile @@ -23,7 +23,7 @@ NOT_FOR_ARCHS_REASON_sparc64= Fails to compile USE_MYSQL= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-mysql=${LOCALBASE} USE_LDCONFIG= yes diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile index 5b5e145f9e93..f6480ce4479f 100644 --- a/databases/mysql++1/Makefile +++ b/databases/mysql++1/Makefile @@ -16,7 +16,7 @@ MAINTAINER= sergey@network-asp.biz COMMENT= Complex C++ API for MySQL${MYSQL_VER} USE_MYSQL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-mysql=${LOCALBASE} \ --includedir=${PREFIX}/include/mysql++ \ --disable-examples diff --git a/databases/mysql++3/Makefile b/databases/mysql++3/Makefile index ebdf0808b0aa..1cbefe279468 100644 --- a/databases/mysql++3/Makefile +++ b/databases/mysql++3/Makefile @@ -16,7 +16,7 @@ MAINTAINER= dudu@dudu.ro COMMENT= Complex C++ API for MySQL${MYSQL_VER} USE_MYSQL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --enable-thread-check USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile index 8d66f8f52217..4d2470f23508 100644 --- a/databases/mysql-connector-odbc/Makefile +++ b/databases/mysql-connector-odbc/Makefile @@ -8,7 +8,7 @@ PORTNAME= mysql-connector-odbc PORTVERSION= 3.51.26 DISTVERSIONSUFFIX= r1127 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-ODBC/3.51 @@ -21,7 +21,7 @@ USE_MYSQL= yes IGNORE_WITH_MYSQL= 323 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 USE_LDCONFIG= yes CFLAGS+= -L${LOCALBASE}/lib LDFLAGS= -L${LOCALBASE}/lib diff --git a/databases/mysql-gui-tools/Makefile b/databases/mysql-gui-tools/Makefile index c11d6c7ef4e0..174cf5e1f63f 100644 --- a/databases/mysql-gui-tools/Makefile +++ b/databases/mysql-gui-tools/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= mysqlclient.15:${PORTSDIR}/databases/mysql50-client \ OPTIONS= QUERY_BROWSER "Build the MySQL Query Browser" on \ ADMINISTRATOR "Build the MySQL Administrator" on -USE_AUTOTOOLS= autoconf:262 libtool:15 automake:110 +USE_AUTOTOOLS= autoconf:262 libtool:22 automake:110 USE_GNOME= gnomelibs libglade2 gtkhtml3 libgnomeprint intlhack gtksourceview USE_GL= gl glut USE_GMAKE= yes diff --git a/databases/mysql-navigator/Makefile b/databases/mysql-navigator/Makefile index 966fc44df514..d716576267b4 100644 --- a/databases/mysql-navigator/Makefile +++ b/databases/mysql-navigator/Makefile @@ -21,7 +21,7 @@ USE_MYSQL= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql MAKE_ENV+= MOC="${MOC}" QTDIR="${QT_PREFIX}" diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile index f8dbd256ef31..d140feb00cfd 100644 --- a/databases/mysql-q4m/Makefile +++ b/databases/mysql-q4m/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/databases/mysql${MYSQL_VER}-server:bui RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql${MYSQL_VER}-server USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes WANT_MYSQL_VER?= 51 diff --git a/databases/mysql-workbench51/Makefile b/databases/mysql-workbench51/Makefile index 024f97a25aa0..c1f4e2920ebf 100644 --- a/databases/mysql-workbench51/Makefile +++ b/databases/mysql-workbench51/Makefile @@ -28,7 +28,7 @@ MAKE_JOBS_SAFE= yes OPTIONS= PYTHON "Enable Python scripting and modules" off -USE_AUTOTOOLS= autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:15:env +USE_AUTOTOOLS= autoheader:262 autoconf:262 automake:110 aclocal:110 libtool:22 AUTOMAKE_ARGS= --add-missing --foreign ACLOCAL_ARGS= AUTOCONF_ARGS= diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile index b78afab92c71..cb7bb32aa5df 100644 --- a/databases/mysql2odbc/Makefile +++ b/databases/mysql2odbc/Makefile @@ -40,7 +40,7 @@ CONFIGURE_ARGS= --with-iodbc CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.post.mk> diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile index 1a08458e272d..29b6b0946ee5 100644 --- a/databases/mysql323-server/Makefile +++ b/databases/mysql323-server/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql323-client -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ --without-debug \ diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile index c052f60c0c0d..b53a2b34fb32 100644 --- a/databases/mysql40-server/Makefile +++ b/databases/mysql40-server/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql40-client -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile index e33db162f7ef..c14854c69861 100644 --- a/databases/mysql41-server/Makefile +++ b/databases/mysql41-server/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql41-client -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile index a61073e86068..f47a3a6602db 100644 --- a/databases/mysql51-server/Makefile +++ b/databases/mysql51-server/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql51-client databases/mysql51-scripts -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile index 1666d8b69b84..4f98f7ce5712 100644 --- a/databases/mysql60-server/Makefile +++ b/databases/mysql60-server/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT?= Multithreaded SQL database (server) SLAVEDIRS= databases/mysql60-client databases/mysql60-scripts -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS= --localstatedir=/var/db/mysql \ diff --git a/databases/mysqlcppapi/Makefile b/databases/mysqlcppapi/Makefile index 312d9837286b..856995029c9e 100644 --- a/databases/mysqlcppapi/Makefile +++ b/databases/mysqlcppapi/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=mysqlcppapi MAINTAINER= ports@FreeBSD.org COMMENT= A fork of mysql++ C++ API for MySQL -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile index 42e5d4ccd987..bd961631ebd2 100644 --- a/databases/namazu2/Makefile +++ b/databases/namazu2/Makefile @@ -22,7 +22,7 @@ PM_BASE= ${SITE_PERL} USE_PERL5= yes USE_ICONV= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-perl5="${PERL}" \ --with-libintl-prefix=${LOCALBASE} \ --with-libiconv-prefix=${LOCALBASE} diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index 62d27b26c91d..9581ab0c3370 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -16,10 +16,10 @@ MAINTAINER= tremere@cainites.net COMMENT= A C library for accessing databases with a single API USE_GMAKE= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} -L../lib -L${LOCALBASE}/lib +LDFLAGS+= ${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib CONFIGURE_ARGS+= --with-backends="${CONFIGURE_MODULES}" CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile index c06657821d69..3ae0e41e486a 100644 --- a/databases/oracle_odbc_driver/Makefile +++ b/databases/oracle_odbc_driver/Makefile @@ -29,7 +29,7 @@ CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" \ LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\ AUTOHEADER=true USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile index dadf6b16dda2..d2a7330a76e0 100644 --- a/databases/postgresql-libpgeasy/Makefile +++ b/databases/postgresql-libpgeasy/Makefile @@ -17,7 +17,7 @@ DIST_SUBDIR= postgresql MAINTAINER= girgen@FreeBSD.org COMMENT= An easy-to-use C interface to PostgreSQL -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PGSQL= YES USE_GMAKE= YES USE_LDCONFIG= YES diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile index efd3fd829793..d74d10db121a 100644 --- a/databases/puredb/Makefile +++ b/databases/puredb/Makefile @@ -15,7 +15,7 @@ DISTNAME= pure-db-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Set of libraries for creating and reading constant databases -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile index 60bf7551b178..de16808eb8fe 100644 --- a/databases/pxlib/Makefile +++ b/databases/pxlib/Makefile @@ -17,7 +17,7 @@ COMMENT= C library to read various Paradox files BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GETTEXT= yes USE_PERL5= yes diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index 07874e2ea9a7..e2a9fffc39cc 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ CONFLICTS= rrdtool-1.0* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile index 8b1f80de5607..a08a79657ed3 100644 --- a/databases/rrdtool10/Makefile +++ b/databases/rrdtool10/Makefile @@ -20,7 +20,7 @@ MAKE_ENV= PERL=${PERL} CONFLICTS= rrdtool-1.2* LATEST_LINK= rrdtool10 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-local-zlib \ --program-transform-name='' diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile index bc350ef86d97..62a224b1b492 100644 --- a/databases/rrdtool12/Makefile +++ b/databases/rrdtool12/Makefile @@ -21,7 +21,7 @@ LATEST_LINK= ${PORTNAME}12 CONFLICTS= rrdtool-1.0* rrdtool-1.3* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile index 9527269e4999..d9c0d629c0c8 100644 --- a/databases/sqlite2/Makefile +++ b/databases/sqlite2/Makefile @@ -17,7 +17,7 @@ COMMENT= An SQL database engine in a C library USE_GMAKE= YES USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-hints=freebsd.hints diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile index 21953cc99fb0..3d2d424e5d3a 100644 --- a/databases/sqlite3/Makefile +++ b/databases/sqlite3/Makefile @@ -18,7 +18,7 @@ CONFLICTS= sqlite34-[0-9]* USE_GMAKE= YES USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES GNU_CONFIGURE= YES CONFIGURE_ARGS= --prefix=${PREFIX} diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile index 9b3d98a19dd9..3ccb41282dc3 100644 --- a/databases/sqlite34/Makefile +++ b/databases/sqlite34/Makefile @@ -19,7 +19,7 @@ CONFLICTS= sqlite3-[0-9]* USE_GMAKE= YES USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_DOS2UNIX= *.pc.in USE_LDCONFIG= YES GNU_CONFIGURE= YES diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 6ba6381b2561..21a4fbd9fa5f 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -18,7 +18,7 @@ COMMENT= A persistent DB connection pooling/proxying/load balancing system LIB_DEPENDS= rudiments.1:${PORTSDIR}/devel/rudiments USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 CONFIGURE_ENV= ${SQLRELAY_CONFIGURE_ENV} \ CPPFLAGS="-I${LOCALBASE}/include" CONFIGURE_ARGS= ${SQLRELAY_CONFIGURE_ARGS} \ diff --git a/databases/tora/Makefile b/databases/tora/Makefile index 3e476cef29f7..cb67f3d878d7 100644 --- a/databases/tora/Makefile +++ b/databases/tora/Makefile @@ -24,7 +24,7 @@ ORACLE_HOME?= ${LOCALBASE}/oracle8-client ORACLE_VER= 8i # Client version ONLY_FOR_ARCHS= i386 -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 autoheader:262 libtool:22 USE_QT_VER= 4 QT_COMPONENTS= gui corelib sql xml network linguist moc_build uic_build rcc_build USE_GMAKE= yes diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile index 802feffad4ab..c08803dc7011 100644 --- a/databases/unixODBC/Makefile +++ b/databases/unixODBC/Makefile @@ -18,7 +18,7 @@ CONFLICTS= libiodbc-[0-9]* USE_GNOME= gnomehack gnometarget USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-static --enable-shared \ --with-libiconv-prefix=${LOCALBASE} USE_LDCONFIG= yes diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index b9579fefe160..aba72ce77f04 100644 --- a/databases/virtuoso/Makefile +++ b/databases/virtuoso/Makefile @@ -19,7 +19,7 @@ COMMENT= Universal SQL/Application Server BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk LIB_DEPENDS= iodbc.3:${PORTSDIR}/databases/libiodbc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-readline\ --with-iodbc=${LOCALBASE}\ --enable-bpel-vad\ diff --git a/databases/xbase/Makefile b/databases/xbase/Makefile index 048d4a524f0a..0094c80543a9 100644 --- a/databases/xbase/Makefile +++ b/databases/xbase/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= An xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= lthack USE_LDCONFIG= yes diff --git a/databases/xbsql/Makefile b/databases/xbsql/Makefile index f9a28b23b9f7..bb40d3e21026 100644 --- a/databases/xbsql/Makefile +++ b/databases/xbsql/Makefile @@ -16,7 +16,7 @@ COMMENT= An SQL wrapper for the XBase DBMS library LIB_DEPENDS= xbase-2.0.0:${PORTSDIR}/databases/xbase -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile index c46b649c8f47..c1898a7e9474 100644 --- a/deskutils/basket/Makefile +++ b/deskutils/basket/Makefile @@ -15,7 +15,7 @@ COMMENT= Desktop organization tool USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes OPTIONS= KONTACT "Kontact plugin" on \ diff --git a/deskutils/bmp-docklet/Makefile b/deskutils/bmp-docklet/Makefile index a1dd71f2c5e3..32ba821aa424 100644 --- a/deskutils/bmp-docklet/Makefile +++ b/deskutils/bmp-docklet/Makefile @@ -19,7 +19,7 @@ COMMENT= System tray controller for beep-media-player BUILD_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player RUN_DEPENDS= beep-media-player:${PORTSDIR}/multimedia/beep-media-player -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/deskutils/bookreader/Makefile b/deskutils/bookreader/Makefile index 35c47361bbae..7d7a9c153781 100644 --- a/deskutils/bookreader/Makefile +++ b/deskutils/bookreader/Makefile @@ -18,6 +18,6 @@ USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/deskutils/contacts/Makefile b/deskutils/contacts/Makefile index c821734c6cf8..95ee1d756354 100644 --- a/deskutils/contacts/Makefile +++ b/deskutils/contacts/Makefile @@ -19,7 +19,7 @@ CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" USE_GMAKE= yes USE_GNOME= gtk20 gnomehier evolutiondataserver -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= contacts.schemas MAN1= ${PORTNAME}.1 # CFLAGS+= -g diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile index a325a2f35a56..54204ee3bb57 100644 --- a/deskutils/dragstack/Makefile +++ b/deskutils/dragstack/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= markus@FreeBSD.org COMMENT= Drop stack applet for KDE -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDEBASE_VER= 3 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile index 88f3a81dcf15..69154a08d9c7 100644 --- a/deskutils/drivel/Makefile +++ b/deskutils/drivel/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeui intlhack gtksourceview USE_BZIP2= yes USE_GMAKE= yes INSTALLS_OMF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile index 633593ba1c98..d1925657172d 100644 --- a/deskutils/genius/Makefile +++ b/deskutils/genius/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gnomevfs2 gtksourceview2 intlhack vte USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-extra-gcc-optimization diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile index b803407947b3..e5eea41702b7 100644 --- a/deskutils/glabels/Makefile +++ b/deskutils/glabels/Makefile @@ -22,7 +22,7 @@ WANT_GNOME= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile index 8f4f9baef51d..f9942a32e2c4 100644 --- a/deskutils/global-menu/Makefile +++ b/deskutils/global-menu/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 automake:19:env autoheader:262:env +USE_AUTOTOOLS= libtool:22 automake:19:env autoheader:262:env INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 9a5f2c02622c..c270dd8b41c2 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -28,7 +28,7 @@ USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ libgnomeprintui gnomedesktop ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile index c102a8d3eae4..b55064c60041 100644 --- a/deskutils/gnotime/Makefile +++ b/deskutils/gnotime/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnotime PORTVERSION= 2.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils gnome MASTER_SITES= SF/gttr:gttr SF/qof:qof DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:gttr \ @@ -23,7 +23,7 @@ USE_XORG= xscrnsaver USE_GNOME= gnomehack gnomeprefix gtkhtml3 intlhack libgnomeui USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 LIBTOOLFILES= configure ../${QOF_DISTNAME}/configure CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ LIBQOF_CFLAGS="${LIBQOF_CFLAGS}" LIBQOF_LIBS="${LIBQOF_LIBS}" diff --git a/deskutils/google-gadgets/Makefile b/deskutils/google-gadgets/Makefile index e4bb19f04920..99349f43d921 100644 --- a/deskutils/google-gadgets/Makefile +++ b/deskutils/google-gadgets/Makefile @@ -7,7 +7,7 @@ PORTNAME= google-gadgets PORTVERSION= 0.10.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= deskutils MASTER_SITES= http://google-gadgets-for-linux.googlecode.com/files/ DISTNAME= ${PORTNAME}-for-linux-${PORTVERSION} @@ -39,7 +39,7 @@ USE_GSTREAMER= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" CPPFLAGS="-I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-ltdl-install=no -USE_AUTOTOOLS= libtool:15:env autoconf:262:env automake:110:env aclocal:110:env libltdl:15 +USE_AUTOTOOLS= libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22 WANT_GNOME= yes USE_GNOME= gnomehack INSTALLS_ICONS= yes diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile index 004f540126c4..7d568ddb8288 100644 --- a/deskutils/gruler/Makefile +++ b/deskutils/gruler/Makefile @@ -15,7 +15,7 @@ MAINTAINER= smyru@heron.pl COMMENT= A simple customizable GTK screen ruler USE_GNOME= gnomeprefix gnomehack libgnomeui libglade2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -export-dynamic" diff --git a/deskutils/gtkjournal/Makefile b/deskutils/gtkjournal/Makefile index 0f951a8fbfa7..62e4172cb683 100644 --- a/deskutils/gtkjournal/Makefile +++ b/deskutils/gtkjournal/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \ PLIST_FILES= bin/gtkjournal lib/libsqlitemm.a lib/libsqlitemm.la \ lib/libsqlitemm.so lib/libsqlitemm.so.0 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/deskutils/karamba/Makefile b/deskutils/karamba/Makefile index afbba0740df3..84c1a4bb10c2 100644 --- a/deskutils/karamba/Makefile +++ b/deskutils/karamba/Makefile @@ -16,7 +16,7 @@ COMMENT= Display various information right on your desktop EXTRA_PATCHES= ${.CURDIR}/../../comms/kallers/files/patch-configure USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/deskutils/katapult/Makefile b/deskutils/katapult/Makefile index 34ca76fcc21d..1b1abbfda930 100644 --- a/deskutils/katapult/Makefile +++ b/deskutils/katapult/Makefile @@ -17,7 +17,7 @@ COMMENT= Fast, extensible launcher for KDE similar to Quicksilver on OSX GNU_CONFIGURE= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= ${PREFIX}/lib/ ${PREFIX}/lib/kde3/ INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/deskutils/kbirthday/Makefile b/deskutils/kbirthday/Makefile index b184f98dd2da..76f06661ec6b 100644 --- a/deskutils/kbirthday/Makefile +++ b/deskutils/kbirthday/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.gfai.de/~jaham/download/ \ MAINTAINER= h.eichmann@gmx.de COMMENT= KDE kicker-applet that reminds you of birthdays and anniversaries -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_KDELIBS_VER=3 USE_LDCONFIG= yes diff --git a/deskutils/kblticker/Makefile b/deskutils/kblticker/Makefile index 8090913945fb..d117defebdcd 100644 --- a/deskutils/kblticker/Makefile +++ b/deskutils/kblticker/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= mich@FreeBSD.org COMMENT= KDE bloglines notifier -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_KDELIBS_VER= 3 diff --git a/deskutils/kchm/Makefile b/deskutils/kchm/Makefile index 68b31d8772bb..1d47b82a6dc7 100644 --- a/deskutils/kchm/Makefile +++ b/deskutils/kchm/Makefile @@ -21,6 +21,6 @@ LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chmlib USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/deskutils/kchmviewer/Makefile b/deskutils/kchmviewer/Makefile index cd2d343ec08f..bcb5e0a2d9c2 100644 --- a/deskutils/kchmviewer/Makefile +++ b/deskutils/kchmviewer/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS+= chm:${PORTSDIR}/misc/chmlib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 DO_NOT_COMPILE+=chmlib CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile index 409c85e1c93b..be99b566e881 100644 --- a/deskutils/kdepim3/Makefile +++ b/deskutils/kdepim3/Makefile @@ -29,7 +29,7 @@ _NO_KDE_FINAL= yes USE_BZIP2= yes USE_BISON= build USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/deskutils/kickpim/Makefile b/deskutils/kickpim/Makefile index 125cdf3ead87..67112010512a 100644 --- a/deskutils/kickpim/Makefile +++ b/deskutils/kickpim/Makefile @@ -17,7 +17,7 @@ COMMENT= Panel applet for editing and accessing the KDE addressbook USE_KDEBASE_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" diff --git a/deskutils/klipoquery/Makefile b/deskutils/klipoquery/Makefile index 1157b8bb4fbf..3943e8746292 100644 --- a/deskutils/klipoquery/Makefile +++ b/deskutils/klipoquery/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/deskutils/kluje/Makefile b/deskutils/kluje/Makefile index c142d5abbb1a..7a3a7c953fe2 100644 --- a/deskutils/kluje/Makefile +++ b/deskutils/kluje/Makefile @@ -17,7 +17,7 @@ COMMENT= A KDE client for the popular online journal site LiveJournal USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g ; \ diff --git a/deskutils/kmatrix3d/Makefile b/deskutils/kmatrix3d/Makefile index a565d168f5f5..fe6b48116f40 100644 --- a/deskutils/kmatrix3d/Makefile +++ b/deskutils/kmatrix3d/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GL= glut GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 automake:19:env autoheader:262:env +USE_AUTOTOOLS= libtool:22 automake:19:env autoheader:262:env USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_PERL5_BUILD= yes diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile index 0462607d25c3..5ac154dcf020 100644 --- a/deskutils/knowit/Makefile +++ b/deskutils/knowit/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \ AUTOMAKE="${TRUE}" diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile index 2d81e2bd479f..583bb9863015 100644 --- a/deskutils/kompose/Makefile +++ b/deskutils/kompose/Makefile @@ -19,7 +19,7 @@ EXTRA_PATCHES= ${PORTSDIR}/x11/kde3/files/extrapatch-old_configure USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_EFL= imlib2 INSTALLS_ICONS= yes diff --git a/deskutils/kooldock/Makefile b/deskutils/kooldock/Makefile index 6f3d6a127843..ca17aacabe6e 100644 --- a/deskutils/kooldock/Makefile +++ b/deskutils/kooldock/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/kooldock GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_KDELIBS_VER= 3 diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile index abd5e8f7fdfe..e173e67605b2 100644 --- a/deskutils/krefty/Makefile +++ b/deskutils/krefty/Makefile @@ -16,7 +16,7 @@ COMMENT= Quick Reference sheets for KDE USE_KDELIBS_VER=3 USE_LDCONFIG= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" DOCSDIR= share/doc/HTML diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile index 4822c5a3eecf..a5daaf697865 100644 --- a/deskutils/krss/Makefile +++ b/deskutils/krss/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE Rich Site Summary viewer USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE} MAKE_ENV= LIBQT="-lqt-mt ${PTHREAD_LIBS}" KDB2HTML=${TRUE} diff --git a/deskutils/ksmoothdock/Makefile b/deskutils/ksmoothdock/Makefile index 149dc061a678..1582edf78622 100644 --- a/deskutils/ksmoothdock/Makefile +++ b/deskutils/ksmoothdock/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_PERL5_BUILD=yes diff --git a/deskutils/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile index e910d946f25e..cdce3de04727 100644 --- a/deskutils/ktagebuch/Makefile +++ b/deskutils/ktagebuch/Makefile @@ -20,7 +20,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile index 4f5594ad941e..981790300e85 100644 --- a/deskutils/kuake/Makefile +++ b/deskutils/kuake/Makefile @@ -15,7 +15,7 @@ COMMENT= KDE konsole application acting like the Quake-console USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index 5089bf0ad2d4..167a6c79daf7 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -18,7 +18,7 @@ DISTNAME= lightning-${PORTNAME}-${DISTVERSION}-source MAINTAINER= gecko@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} HAS_CONFIGURE= yes diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index 5089bf0ad2d4..167a6c79daf7 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -18,7 +18,7 @@ DISTNAME= lightning-${PORTNAME}-${DISTVERSION}-source MAINTAINER= gecko@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} HAS_CONFIGURE= yes diff --git a/deskutils/metabar/Makefile b/deskutils/metabar/Makefile index 5e4b927558e5..0967f38c4d3e 100644 --- a/deskutils/metabar/Makefile +++ b/deskutils/metabar/Makefile @@ -17,7 +17,7 @@ COMMENT= Sidebar plugin for Konqueror WRKSRC= ${WRKDIR}/${PORTNAME} USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/deskutils/multisync/Makefile b/deskutils/multisync/Makefile index a40ea405ac26..6337ce02f804 100644 --- a/deskutils/multisync/Makefile +++ b/deskutils/multisync/Makefile @@ -20,7 +20,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION} USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix libgnomeui USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env libtool:15 +USE_AUTOTOOLS= automake:19:env libtool:22 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" pre-configure: diff --git a/deskutils/nautilus-locked-folder/Makefile b/deskutils/nautilus-locked-folder/Makefile index 297c9012e846..b0261d2d36a1 100644 --- a/deskutils/nautilus-locked-folder/Makefile +++ b/deskutils/nautilus-locked-folder/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= pav MAINTAINER= gnome@FreeBSD.org COMMENT= Nautilus plugin that allows you to encrypt the contents of a folder -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= nautilus2 eel2 PKGCONFIGS= gtk+-2.0 libglade-2.0 libnautilus-extension libgnomeui-2.0 diff --git a/deskutils/sunbird/Makefile b/deskutils/sunbird/Makefile index 5089bf0ad2d4..167a6c79daf7 100644 --- a/deskutils/sunbird/Makefile +++ b/deskutils/sunbird/Makefile @@ -18,7 +18,7 @@ DISTNAME= lightning-${PORTNAME}-${DISTVERSION}-source MAINTAINER= gecko@FreeBSD.org COMMENT= Redesign of the Mozilla Calendar with XUL interface -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} HAS_CONFIGURE= yes diff --git a/deskutils/taskjuggler/Makefile b/deskutils/taskjuggler/Makefile index 7c1a201bf838..130fdcdd2d63 100644 --- a/deskutils/taskjuggler/Makefile +++ b/deskutils/taskjuggler/Makefile @@ -28,7 +28,7 @@ USE_BZIP2= yes USE_QT_VER= 3 USE_PERL5_RUN= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}" diff --git a/devel/Makefile b/devel/Makefile index be463d831e84..a9394b3c0211 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -680,7 +680,7 @@ SUBDIR += liblogging SUBDIR += liblouis SUBDIR += liblouisxml - SUBDIR += libltdl15 + SUBDIR += libltdl22 SUBDIR += libmaa SUBDIR += libmatheval SUBDIR += libmba @@ -744,7 +744,7 @@ SUBDIR += libticalcs SUBDIR += libtifiles SUBDIR += libtifiles2 - SUBDIR += libtool15 + SUBDIR += libtool22 SUBDIR += libublio SUBDIR += libukcprog SUBDIR += libunicode diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile index e3bffecfa22f..c1e7a0529148 100644 --- a/devel/ORBit2/Makefile +++ b/devel/ORBit2/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack libidl ltverhack referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/ace/Makefile b/devel/ace/Makefile index cd1333313381..af9009d15f2b 100644 --- a/devel/ace/Makefile +++ b/devel/ace/Makefile @@ -18,7 +18,7 @@ COMMENT= The Adaptive Communication Environment for C++ CONFLICTS= ace+tao-5* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/devel/alf/Makefile b/devel/alf/Makefile index e5a4a293066a..e28881dc287c 100644 --- a/devel/alf/Makefile +++ b/devel/alf/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= largefiles MAINTAINER= ports@FreeBSD.org COMMENT= Abstract Large File -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile index dcd5ec03500e..e2915e1163f5 100644 --- a/devel/anjuta/Makefile +++ b/devel/anjuta/Makefile @@ -29,7 +29,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ autogen:${PORTSDIR}/devel/autogen \ neato:${PORTSDIR}/graphics/graphviz \ p5-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \ - libtool:${PORTSDIR}/devel/libtool15 \ + libtool:${PORTSDIR}/devel/libtool22 \ ${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme \ exctags:${PORTSDIR}/devel/ctags diff --git a/devel/apr/Makefile b/devel/apr/Makefile index cc4368e93ed5..225915059d8d 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -31,7 +31,7 @@ APR_VERSION= 1.3.6 APU_VERSION= 1.3.8 USE_ICONV= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile index cc4368e93ed5..225915059d8d 100644 --- a/devel/apr0/Makefile +++ b/devel/apr0/Makefile @@ -31,7 +31,7 @@ APR_VERSION= 1.3.6 APU_VERSION= 1.3.8 USE_ICONV= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index cc4368e93ed5..225915059d8d 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -31,7 +31,7 @@ APR_VERSION= 1.3.6 APU_VERSION= 1.3.8 USE_ICONV= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile index cc4368e93ed5..225915059d8d 100644 --- a/devel/apr2/Makefile +++ b/devel/apr2/Makefile @@ -31,7 +31,7 @@ APR_VERSION= 1.3.6 APU_VERSION= 1.3.8 USE_ICONV= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22:env USE_PERL5_BUILD= yes USE_PYTHON_BUILD= yes USE_LDCONFIG= yes diff --git a/devel/argp-standalone/Makefile b/devel/argp-standalone/Makefile index 1a141a617517..6ff4d69a5efe 100644 --- a/devel/argp-standalone/Makefile +++ b/devel/argp-standalone/Makefile @@ -17,7 +17,7 @@ MAINTAINER= sem@FreeBSD.org COMMENT= Standalone version of arguments parsing functions from GLIBC GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:22 AUTOMAKE_ARGS= -c -a ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal USE_LDCONFIG= yes diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile index 38c52274f637..72a53736278c 100644 --- a/devel/argtable/Makefile +++ b/devel/argtable/Makefile @@ -16,7 +16,7 @@ MAINTAINER= corky1951@comcast.net COMMENT= An ANSI C library for parsing GNU style command line arguments USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN3= argtable2.3 diff --git a/devel/atlas-devel/Makefile b/devel/atlas-devel/Makefile index 583b4f5fce8e..335dfa84b3da 100644 --- a/devel/atlas-devel/Makefile +++ b/devel/atlas-devel/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION:S/.r/rc/} MAINTAINER= oliver@FreeBSD.org COMMENT= A C++ reference implementation of the Atlas protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES USE_BZIP2= YES USE_GNOME= gnomehack diff --git a/devel/atlas/Makefile b/devel/atlas/Makefile index bcca38a9cd36..9c1880146158 100644 --- a/devel/atlas/Makefile +++ b/devel/atlas/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-C++-${PORTVERSION} MAINTAINER= oliver@FreeBSD.org COMMENT= A C++ reference implementation of the Atlas protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES USE_BZIP2= YES USE_GNOME= gnomehack diff --git a/devel/autotools/Makefile b/devel/autotools/Makefile index fc811947cfe0..d80d49d71f64 100644 --- a/devel/autotools/Makefile +++ b/devel/autotools/Makefile @@ -13,7 +13,7 @@ DISTFILES= # none MAINTAINER= ade@FreeBSD.org COMMENT= Autotools meta-port -RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool15 +RUN_DEPENDS= libtool:${PORTSDIR}/devel/libtool22 PLIST_FILES= share/${PORTNAME} NO_BUILD= yes diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile index a8aba246d81c..e76a6e9fb52c 100644 --- a/devel/bglibs/Makefile +++ b/devel/bglibs/Makefile @@ -18,7 +18,7 @@ COMMENT= One stop library package by Bruce Guenter NOT_FOR_ARCHS= alpha USE_PERL5= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env LDFLAGS?= -s BGLIBS_INC= ${PREFIX}/include/${PORTNAME} BGLIBS_LIB= ${PREFIX}/lib/${PORTNAME} diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index 2c5426da4537..6edebf1077e8 100644 --- a/devel/boehm-gc/Makefile +++ b/devel/boehm-gc/Makefile @@ -15,7 +15,7 @@ DISTNAME= gc${PORTVERSION:S/.a/alpha/} MAINTAINER= stas@FreeBSD.org COMMENT= Garbage collection and memory leak detection for C and C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnometarget USE_LDCONFIG= yes diff --git a/devel/bullet/Makefile b/devel/bullet/Makefile index aaf07921d5bf..5ce0f77f3e74 100644 --- a/devel/bullet/Makefile +++ b/devel/bullet/Makefile @@ -18,7 +18,7 @@ COMMENT= 3D collision detection and rigid body dynamics library BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam -USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:22:env GNU_CONFIGURE= yes USE_DOS2UNIX= yes USE_GL= glu glut diff --git a/devel/c_c++_reference/Makefile b/devel/c_c++_reference/Makefile index 3656d2e0b82a..e18ae7ff2fe0 100644 --- a/devel/c_c++_reference/Makefile +++ b/devel/c_c++_reference/Makefile @@ -18,7 +18,7 @@ COMMENT= C/C++ reference manual for KDevelop RUN_DEPENDS= kdevelop:${PORTSDIR}/devel/kdevelop USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER= 3 USE_GMAKE= yes diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile index a47dd0b320c0..316e18978b15 100644 --- a/devel/cdialog/Makefile +++ b/devel/cdialog/Makefile @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= scjamorim@bsd.com.br COMMENT= An enhanced version of 'dialog' to work with ncurses -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include/${PORTNAME} --with-libtool diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 257cc5c57e7b..ecab6bac00a4 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ WRKSRC= ${WRKDIR}/ClanLib-${PORTVERSION} CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-clanJavaScript --disable-docs diff --git a/devel/clint/Makefile b/devel/clint/Makefile index e23d3a8a49d8..1c850263bc5c 100644 --- a/devel/clint/Makefile +++ b/devel/clint/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A static source code checker for C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/clint/pkg-plist b/devel/clint/pkg-plist index 81410e76cfc3..e4bcbf1c7d51 100644 --- a/devel/clint/pkg-plist +++ b/devel/clint/pkg-plist @@ -1,7 +1,6 @@ bin/clint include/clint/exceptions.h include/clint/python.h -lib/clint/python.a lib/clint/python.la lib/clint/python.so lib/clint/python.so.0 diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile index 884048668f37..87c0b2945858 100644 --- a/devel/cppunit/Makefile +++ b/devel/cppunit/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= SF MAINTAINER= yzlin@FreeBSD.org COMMENT= C++ port of the JUnit framework for unit testing -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/cstringbuffer/Makefile b/devel/cstringbuffer/Makefile index 4738cbddd07e..40d64b3a1d44 100644 --- a/devel/cstringbuffer/Makefile +++ b/devel/cstringbuffer/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= # disappeared MAINTAINER= ports@FreeBSD.org COMMENT= File-like IO for strings -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes MAN3= csb.3 diff --git a/devel/dbus-glib/Makefile b/devel/dbus-glib/Makefile index fb816bb51ffc..14c5539a8a33 100644 --- a/devel/dbus-glib/Makefile +++ b/devel/dbus-glib/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_GNOME= gnomehack glib20 ltverhack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} \ --disable-doxygen-docs \ diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile index 5110022c6ec9..8b5212260689 100644 --- a/devel/dbus-sharp/Makefile +++ b/devel/dbus-sharp/Makefile @@ -23,7 +23,7 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC} USE_GNOME= gnomehack gnometarget gtksharp10 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-mono \ --disable-python \ --disable-gcj \ diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 488aa5fdd2d2..6b9dffbe4eb5 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_GNOME?= gnomehack libxml2 ltverhack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS=--localstatedir=/var \ --with-test-socket-dir=${WRKDIR} \ diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index bfe792a84495..a55316e6b9f5 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -23,7 +23,7 @@ USE_XORG= x11 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack gnomeprefix libgnomeui libwnck -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 35297d9a8283..f69ec8ae68a2 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/dotconf++/Makefile b/devel/dotconf++/Makefile index a22a40a2a189..d00132affad5 100644 --- a/devel/dotconf++/Makefile +++ b/devel/dotconf++/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= mark_sf@kikg.ifmo.ru COMMENT= Configuration file parser written in C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile index a4aa71551ec1..5a8210dc95a9 100644 --- a/devel/dotconf/Makefile +++ b/devel/dotconf/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.azzit.de/dotconf/download/v1.1/ MAINTAINER= clement@FreeBSD.org COMMENT= A simple, powerful configuration-file parser -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/eboxy/Makefile b/devel/eboxy/Makefile index 68f92dc9d1c7..9cd3ab7fca0f 100644 --- a/devel/eboxy/Makefile +++ b/devel/eboxy/Makefile @@ -20,7 +20,7 @@ USE_BISON= build USE_BZIP2= yes USE_SDL= sdl gui mixer USE_GNOME= gnometarget libxml2 lthack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-lirc diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile index e7bab3508d32..01c69399a82f 100644 --- a/devel/elfio/Makefile +++ b/devel/elfio/Makefile @@ -17,12 +17,12 @@ DISTNAME= ${PORTNAME:U}-${PORTVERSION} MAINTAINER= stas@FreeBSD.org COMMENT= C++ library for reading and generating files in the ELF binary format -BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool15 +BUILD_DEPENDS= libtoolize:${PORTSDIR}/devel/libtool22 GNU_CONFIGURE= yes USE_GNOME= gnometarget USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:22 AUTOMAKE_ARGS= -c -a ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal diff --git a/devel/entity/Makefile b/devel/entity/Makefile index ca20d9462ae4..21e77ed174e9 100644 --- a/devel/entity/Makefile +++ b/devel/entity/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= python:${PORTSDIR}/lang/python GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-tcl=no -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gtk12 USE_LDCONFIG= ${PREFIX}/lib/entity/clib diff --git a/devel/fam/Makefile b/devel/fam/Makefile index f4dd4fe2b4fb..f209e87d6867 100644 --- a/devel/fam/Makefile +++ b/devel/fam/Makefile @@ -17,7 +17,7 @@ COMMENT= A file alteration monitor CFLAGS+= -Wno-deprecated -USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:262 libtool:22 AUTOMAKE_ARGS= -c -a USE_GMAKE= yes USE_GNOME= gnometarget diff --git a/devel/flatzebra/Makefile b/devel/flatzebra/Makefile index adf1e4a38cc2..d9ab5d83767c 100644 --- a/devel/flatzebra/Makefile +++ b/devel/flatzebra/Makefile @@ -17,7 +17,7 @@ COMMENT= A generic game engine for 2D double-buffering animation GNU_CONFIGURE= yes CONFIGURE_ARGS= --includedir=${PREFIX}/include -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl mixer image USE_GNOME= pkgconfig diff --git a/devel/flowdesigner/Makefile b/devel/flowdesigner/Makefile index fb10b96354c0..c1f186078b9d 100644 --- a/devel/flowdesigner/Makefile +++ b/devel/flowdesigner/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ USE_GNOME= gnomehack gnometarget libgnomeui libxml2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= ${CONFIGURE_SCRIPT} FuzzyEngine/configure \ HMM/configure NNet/configure \ VQ/configure audio_blocks/configure \ diff --git a/devel/gamin/Makefile b/devel/gamin/Makefile index d9791e74daa7..489468d721ec 100644 --- a/devel/gamin/Makefile +++ b/devel/gamin/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.gnome.org/~veillard/gamin/sources/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A file and directory monitoring system -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME?= gnomehack _glib20 USE_LDCONFIG= yes 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 <bsd.port.mk> diff --git a/devel/gaul/files/patch-Makefile.am b/devel/gaul/files/patch-Makefile.in index 067456489e7f..f7b3be56e226 100644 --- a/devel/gaul/files/patch-Makefile.am +++ b/devel/gaul/files/patch-Makefile.in @@ -1,9 +1,9 @@ ---- ./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 @@ +--- 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 . diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile index 4bcf80eb9305..283c76b2f621 100644 --- a/devel/gconf/Makefile +++ b/devel/gconf/Makefile @@ -20,7 +20,7 @@ COMMENT= A configuration database system for GNOME LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnometarget glib12 gtk12 oaf libxml orbit diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 6e0d15e5a9f2..d10f2f895b1b 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -30,7 +30,7 @@ USE_GETTEXT= yes USE_GNOME= gnomehier gnomehack orbit2 gtk20 libxml2 ltverhack \ referencehack intlhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc # --enable-gconf-source=${PREFIX}/etc/gconf/schemas \ diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile index b3abac48664d..ceb877a1ffd6 100644 --- a/devel/gconfmm/Makefile +++ b/devel/gconfmm/Makefile @@ -18,7 +18,7 @@ COMMENT= C++ wrapper for gconf2 API library LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack lthack gconf2 GNU_CONFIGURE= yes diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile index e324772a4d2f..36753b241cb2 100644 --- a/devel/gengameng/Makefile +++ b/devel/gengameng/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://ftp.osuosl.org/pub/FreeBSD/distfiles/ MAINTAINER= ports@FreeBSD.org COMMENT= An SDL game engine library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= image sdl GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index 9e0c8e68dc9c..4886ad73267f 100644 --- a/devel/gettext/Makefile +++ b/devel/gettext/Makefile @@ -18,7 +18,7 @@ COMMENT= GNU gettext package USE_ICONV= yes LIBTOOLFILES= autoconf-lib-link/configure gettext-runtime/configure \ gettext-runtime/libasprintf/configure gettext-tools/configure -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= ACLOCAL="${TRUE}" \ AUTOCONF="${TRUE}" \ AUTOMAKE="${TRUE}" \ diff --git a/devel/gflags/Makefile b/devel/gflags/Makefile index cbf5c4b6d4d6..a4f23f8c7300 100644 --- a/devel/gflags/Makefile +++ b/devel/gflags/Makefile @@ -14,7 +14,7 @@ MAINTAINER= leeym@FreeBSD.org COMMENT= Commandline flags module for C++ PROJECTHOST= google-gflags -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile index eae29af5e72d..dec2186541c5 100644 --- a/devel/glade3/Makefile +++ b/devel/glade3/Makefile @@ -24,7 +24,7 @@ WANT_GNOME= yes USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile index b8cdb4764a3f..5d166bc00a86 100644 --- a/devel/glib12/Makefile +++ b/devel/glib12/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Some useful routines of C programming (previous stable version) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 6727ffe0d1e1..21f8013d99ab 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -32,7 +32,7 @@ USE_BZIP2= yes LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig ltverhack USE_GMAKE= yes diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile index 5b90225cbd40..a933b8da6341 100644 --- a/devel/glibmm/Makefile +++ b/devel/glibmm/Makefile @@ -29,7 +29,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile index 8f77627ddbf0..d40d6deef01b 100644 --- a/devel/gnome-vfs/Makefile +++ b/devel/gnome-vfs/Makefile @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomemimedata gconf2 \ ltverhack referencehack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-openssl \ diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile index cc9b57cea849..dcf8d2604e01 100644 --- a/devel/goffice/Makefile +++ b/devel/goffice/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome libgnomeui ltverhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/goffice04/Makefile b/devel/goffice04/Makefile index cfd0cbd3d5f9..72c06d4836c5 100644 --- a/devel/goffice04/Makefile +++ b/devel/goffice04/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome libgnomeui ltverhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/goffice06/Makefile b/devel/goffice06/Makefile index b1f705735ef0..35715c704578 100644 --- a/devel/goffice06/Makefile +++ b/devel/goffice06/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome libgnomeui ltverhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/goffice1/Makefile b/devel/goffice1/Makefile index 773656250464..9ada33279e5b 100644 --- a/devel/goffice1/Makefile +++ b/devel/goffice1/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprint libglade2 \ libgsf_gnome ltverhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/gpsim/Makefile b/devel/gpsim/Makefile index c3d1e3b34b77..54389530a5a3 100644 --- a/devel/gpsim/Makefile +++ b/devel/gpsim/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ gtkextra-x11-2.0.1:${PORTSDIR}/x11-toolkits/gtkextra2 RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/gtkmozedit/Makefile b/devel/gtkmozedit/Makefile index ab93cd17d00f..bc1903afde35 100644 --- a/devel/gtkmozedit/Makefile +++ b/devel/gtkmozedit/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Text editor widget based on Mozilla's editing functionality -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/guichan/Makefile b/devel/guichan/Makefile index 2a678df22bef..7498e1879e11 100644 --- a/devel/guichan/Makefile +++ b/devel/guichan/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= mva@FreeBSD.org COMMENT= A small, efficient C++ GUI library designed for games -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile index 6d7356f74807..70ab9463ab08 100644 --- a/devel/gwenhywfar/Makefile +++ b/devel/gwenhywfar/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls OPTIONS= MEMDEBUG "Enable memory debugger statistic" off \ PORTDOCS "Install documentation (requires doxygen)" off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_GETTEXT= yes diff --git a/devel/ixlib/Makefile b/devel/ixlib/Makefile index de79f00cb4ef..63ce32312250 100644 --- a/devel/ixlib/Makefile +++ b/devel/ixlib/Makefile @@ -18,7 +18,7 @@ COMMENT= A small C++ tools library based on STL USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/devel/jakelib2/Makefile b/devel/jakelib2/Makefile index 36b3644734c0..182b203b8430 100644 --- a/devel/jakelib2/Makefile +++ b/devel/jakelib2/Makefile @@ -16,7 +16,7 @@ COMMENT= A cross platform C++ class library with a Java-like API LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile index 9378dea97d21..213655586512 100644 --- a/devel/jclassinfo/Makefile +++ b/devel/jclassinfo/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Shows information about Java class, dependencies and more -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gnomehack GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/jrtplib/Makefile b/devel/jrtplib/Makefile index 677244b124a0..26f18a0df509 100644 --- a/devel/jrtplib/Makefile +++ b/devel/jrtplib/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://research.edm.uhasselt.be/jori/jrtplib/ MAINTAINER= hopet@ics.muni.cz COMMENT= Object-oriented RTP library written in C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile index 450c41e6de33..37d5331423db 100644 --- a/devel/json-glib/Makefile +++ b/devel/json-glib/Makefile @@ -18,7 +18,7 @@ COMMENT= JSON (RFC 4627) interface for Glib USE_GMAKE= yes USE_GNOME= glib20 gnomehack gnomeprefix ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/kcachegrind/Makefile b/devel/kcachegrind/Makefile index 7d1a561f84eb..92870700ea26 100644 --- a/devel/kcachegrind/Makefile +++ b/devel/kcachegrind/Makefile @@ -18,7 +18,7 @@ COMMENT= Profiling Visualization Tool ONLY_FOR_ARCHS= i386 amd64 CONFLICTS= kdesdk3-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_KDELIBS_VER=3 INSTALLS_ICONS= yes diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile index a2a4aa2029f0..780fe897de57 100644 --- a/devel/kdbg/Makefile +++ b/devel/kdbg/Makefile @@ -16,7 +16,7 @@ COMMENT= A graphical user interface around gdb using KDE USE_KDELIBS_VER= 3 USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes INSTALLS_ICONS= yes CONFIGURE_ARGS= --with-kde-version=3 diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 665f21035c7e..62e7ec31058c 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -28,7 +28,7 @@ USE_PERL5= yes USE_BZIP2= yes USE_GMAKE= yes USE_BDB= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 3d8418c3e2b4..c1d9e41a39b3 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -40,7 +40,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes USE_BDB= yes -USE_AUTOTOOLS= libtool:15 autotools:run +USE_AUTOTOOLS= libtool:22 autotools:run _NO_KDE_FINAL= yes CONFIGURE_ARGS+=--with-qtdoc-dir=${LOCALBASE}/share/doc/qt/html \ --with-db-includedir=${BDB_INCLUDE_DIR} \ diff --git a/devel/klassmodeler/Makefile b/devel/klassmodeler/Makefile index 4a8266f75f2f..acbe310ac109 100644 --- a/devel/klassmodeler/Makefile +++ b/devel/klassmodeler/Makefile @@ -19,7 +19,7 @@ COMMENT= A tool for visually creating and documenting classes USE_ZIP= yes WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= WXWINDOWS="yes" USE_WX= 2.4 diff --git a/devel/kprof/Makefile b/devel/kprof/Makefile index e9b27934c402..79e98a6cf5b9 100644 --- a/devel/kprof/Makefile +++ b/devel/kprof/Makefile @@ -17,7 +17,7 @@ MAINTAINER= pmarquis@pobox.com COMMENT= A profiling tool for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= KDB2HTML=${PREFIX}/bin/kdb2html USE_GMAKE= yes MAKE_ENV= ${CONFIGURE_ENV} diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile index 58b327bb8fff..442ced87884b 100644 --- a/devel/kscope/Makefile +++ b/devel/kscope/Makefile @@ -24,7 +24,7 @@ DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME} USE_BISON= build USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes INSTALLS_ICONS= yes diff --git a/devel/kxl/Makefile b/devel/kxl/Makefile index b0b5ee938ce6..e3e3716cecaa 100644 --- a/devel/kxl/Makefile +++ b/devel/kxl/Makefile @@ -15,7 +15,7 @@ DISTNAME= KXL-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A visual, sound library for games -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_XORG= xpm x11 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 9a3813e47219..09c61eb11f07 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= image sdl USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes diff --git a/devel/lasi/Makefile b/devel/lasi/Makefile index 1d7cc983f31e..4b73a11bbb44 100644 --- a/devel/lasi/Makefile +++ b/devel/lasi/Makefile @@ -7,6 +7,7 @@ PORTNAME= lasi PORTVERSION= 1.1.0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF DISTNAME= libLASi-${PORTVERSION} @@ -15,7 +16,7 @@ MAINTAINER= lme@FreeBSD.org COMMENT= C++ stream output interface for creating Postscript documents USE_GNOME= pango pkgconfig -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 PKG_CONFIG_PATH= ${PREFIX}/libdata/pkgconfig CONFIGURE_ENV+= PKG_CONFIG_PATH=${PKG_CONFIG_PATH} diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile index 6d1c08ce61dd..8fdb76d863b1 100644 --- a/devel/libPropList/Makefile +++ b/devel/libPropList/Makefile @@ -16,7 +16,7 @@ DISTNAME= libPropList-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Property library for gnome and Window Maker -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile index e3e6ec78b846..a3d1a22805ce 100644 --- a/devel/libassetml/Makefile +++ b/devel/libassetml/Makefile @@ -18,7 +18,7 @@ COMMENT= Devel Library to share image and audio files between projects LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomeprefix gnometarget glib20 libxml2 pkgconfig USE_GETTEXT= yes diff --git a/devel/libast/Makefile b/devel/libast/Makefile index 666c1e11181b..cf19b3ef4f13 100644 --- a/devel/libast/Makefile +++ b/devel/libast/Makefile @@ -17,7 +17,7 @@ COMMENT= A library of assorted spiffy things LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack USE_EFL= imlib2 GNU_CONFIGURE= yes diff --git a/devel/libbegemot/Makefile b/devel/libbegemot/Makefile index b68645bd3ac7..faffaa5fa33c 100644 --- a/devel/libbegemot/Makefile +++ b/devel/libbegemot/Makefile @@ -7,7 +7,7 @@ PORTNAME= libbegemot PORTVERSION= 1.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://people.freebsd.org/~harti/libbegemot/ DISTNAME= libbegemot-${PORTVERSION} @@ -17,7 +17,7 @@ COMMENT= A function library for begemot tools GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libltdl:15 libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libltdl:22 libtool:22 USE_LDCONFIG= yes @@ -28,6 +28,9 @@ MLINKS= xalloc.1 xrealloc.1 run-autotools:: @(cd ${CONFIGURE_WRKSRC} && ${ACLOCAL} -I ${LIBTOOL_SHAREDIR}/libltdl/) @(cd ${CONFIGURE_WRKSRC} && ${AUTOCONF}) + @${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${WRKSRC}/configure post-install: .for i in ${MAN1} diff --git a/devel/libbegemot/pkg-plist b/devel/libbegemot/pkg-plist index 0945347caaef..f749de5af648 100644 --- a/devel/libbegemot/pkg-plist +++ b/devel/libbegemot/pkg-plist @@ -1,4 +1,5 @@ lib/libbegemot.a +lib/libbegemot.la lib/libbegemot.so lib/libbegemot.so.1 include/begemot.h diff --git a/devel/libbinio/Makefile b/devel/libbinio/Makefile index 851f8ee4633d..f4207403baa4 100644 --- a/devel/libbinio/Makefile +++ b/devel/libbinio/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ehaupt@FreeBSD.org COMMENT= Binary I/O stream class library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/devel/libbnr/Makefile b/devel/libbnr/Makefile index c6274c909847..5acc47e99bfa 100644 --- a/devel/libbnr/Makefile +++ b/devel/libbnr/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://dspam.nuclearelephant.com/sources/extras/ \ MAINTAINER= itetcu@FreeBSD.org COMMENT= GPL implementation of the Bayesian Noise Reduction algorithm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS+= --includedir=${PREFIX}/include/${PORTNAME} diff --git a/devel/libbonobomm/Makefile b/devel/libbonobomm/Makefile index 7418c36cf251..b5954060c2dc 100644 --- a/devel/libbonobomm/Makefile +++ b/devel/libbonobomm/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack libbonobo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile index 18ee9b774034..39e957e870ab 100644 --- a/devel/libcapsinetwork/Makefile +++ b/devel/libcapsinetwork/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/ MAINTAINER= ports@FreeBSD.org COMMENT= Network library aimed at easy development of C++ server daemons -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libchipcard-kde/Makefile b/devel/libchipcard-kde/Makefile index a9aab91b7102..528d764c9f4b 100644 --- a/devel/libchipcard-kde/Makefile +++ b/devel/libchipcard-kde/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE tools for LibChipCard LIB_DEPENDS= chipcard.20:${PORTSDIR}/devel/libchipcard:install USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --with-distri=freebsd --with-kde3-prefix=${LOCALBASE}\ --with-applnk-dir=${PREFIX}/share/applnk/Utilities USE_KDELIBS_VER= 3 diff --git a/devel/libchipcard/Makefile b/devel/libchipcard/Makefile index 8d55d89db9cc..8002ad9d86b8 100644 --- a/devel/libchipcard/Makefile +++ b/devel/libchipcard/Makefile @@ -16,7 +16,7 @@ COMMENT= A library for easy access to chipcards LIB_DEPENDS= pcsclite.1:${PORTSDIR}/devel/pcsc-lite -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_OPENSSL= yes GNU_CONFIGURE= yes diff --git a/devel/libconfuse/Makefile b/devel/libconfuse/Makefile index 3f48e0655b4e..3844be0b68bb 100644 --- a/devel/libconfuse/Makefile +++ b/devel/libconfuse/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS+= ${LOCALBASE}/lib/libcheck.a:${PORTSDIR}/devel/libcheck .endif USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig CONFIGURE_ARGS+= --disable-nls diff --git a/devel/libcwd/Makefile b/devel/libcwd/Makefile index 14fa90150200..5d0182fa3036 100644 --- a/devel/libcwd/Makefile +++ b/devel/libcwd/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= The C++ Debugging Support Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-threading --disable-pch --disable-location USE_GMAKE= yes USE_GNOME= pkgconfig diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile index 8dc7de1de51d..120a8c8b4e35 100644 --- a/devel/libdaemon/Makefile +++ b/devel/libdaemon/Makefile @@ -14,7 +14,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Lightweight C library that eases the writing of UNIX daemons CONFIGURE_ARGS= --disable-lynx -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget ltverhack USE_LDCONFIG= yes diff --git a/devel/libdnsres/Makefile b/devel/libdnsres/Makefile index 140b3d0e347b..bd7c2ecec066 100644 --- a/devel/libdnsres/Makefile +++ b/devel/libdnsres/Makefile @@ -17,8 +17,9 @@ COMMENT= Provides a non-blocking thread-safe API for resolving DNS names BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes +CONFIGURE_ARGS=--with-libevent=${LOCALBASE} PLIST_SUB+= PORTVERSION="${PORTVERSION}" @@ -28,6 +29,7 @@ MLINKS= dnsres.3 dnsres_init.3 dnsres.3 dnsres_gethostbyname.3 \ dnsres.3 dnsres_getaddrinfo.3 post-patch: - @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=, ; s|top_buildir|top_builddir|g' \ + ${WRKSRC}/Makefile.in .include <bsd.port.mk> diff --git a/devel/libdsp/Makefile b/devel/libdsp/Makefile index 546070c1598d..cec92bd8f5f9 100644 --- a/devel/libdsp/Makefile +++ b/devel/libdsp/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ class library of common digital signal processing functions WRKSRC= ${WRKDIR}/libdsp-src-${PORTVERSION}/${PORTNAME:S/dsp/DSP/}-${PORTVERSION} -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env USE_GMAKE= yes MAKE_ENV= MKDIR="${MKDIR}" INLINE_VER="${INLINE_VER}" MAKEFILE= Makefile.BSD diff --git a/devel/libfs++/Makefile b/devel/libfs++/Makefile index eb581fbacbfd..07d6abf709fe 100644 --- a/devel/libfs++/Makefile +++ b/devel/libfs++/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= . archive MAINTAINER= ports@FreeBSD.org COMMENT= C++ library which provides a file_iterator class -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libftdi/Makefile b/devel/libftdi/Makefile index 3c59be202987..3fddd24ce07c 100644 --- a/devel/libftdi/Makefile +++ b/devel/libftdi/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/ MAINTAINER= o.davydenko@gmail.com COMMENT= A library (using libusb) to talk to FTDI chips -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" USE_LDCONFIG= yes diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile index cdfda30e8440..d0d65267908c 100644 --- a/devel/libgdata/Makefile +++ b/devel/libgdata/Makefile @@ -21,7 +21,7 @@ USE_LDCONFIG= yes USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= intltool CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile index 8aed6eed0a02..d8fce11e085d 100644 --- a/devel/libghthash/Makefile +++ b/devel/libghthash/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/ MAINTAINER= gahr@FreeBSD.org COMMENT= Generic Hash Table -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --datarootdir=${PREFIX} USE_LDCONFIG= yes diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 37a6199c9835..59311e1bee65 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -18,7 +18,7 @@ USE_PERL5= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier gnomedb USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-bonobo --enable-gnomedb CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile index 03ccdd00f3d1..7c394a344af5 100644 --- a/devel/libglademm/Makefile +++ b/devel/libglademm/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_XORG= x11 sm USE_GMAKE= yes USE_GNOME= gnomehack libglade2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile index 033b138061c9..f75b15c27f30 100644 --- a/devel/libgsf/Makefile +++ b/devel/libgsf/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes USE_GNOME?= gnomehack gnomeprefix glib20 libxml2 ltverhack intlhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS?=--without-gnome-vfs --without-python --with-gio \ --without-bonobo CONFIGURE_ENV?= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 44e00260a610..261e52bda9ff 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -21,7 +21,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 ltverhack intlhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libgutenfetch/Makefile b/devel/libgutenfetch/Makefile index a94777d65dca..3f1c785a575a 100644 --- a/devel/libgutenfetch/Makefile +++ b/devel/libgutenfetch/Makefile @@ -17,7 +17,7 @@ COMMENT= A library that allows application developers to connect to PG LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl:install -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/devel/libical/Makefile b/devel/libical/Makefile index 270c7edc179c..e993d8d57927 100644 --- a/devel/libical/Makefile +++ b/devel/libical/Makefile @@ -16,7 +16,7 @@ MAINTAINER= gnome@freebsd.org COMMENT= An implementation of the IETF's Calendaring and Scheduling protocols USE_GNOME= gnomehack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5_BUILD=yes diff --git a/devel/libltdl15/pkg-plist b/devel/libltdl15/pkg-plist deleted file mode 100644 index c1b675bb6aef..000000000000 --- a/devel/libltdl15/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -@comment $FreeBSD: /tmp/pcvs/ports/devel/libltdl15/Attic/pkg-plist,v 1.1 2003-07-02 18:52:29 ade Exp $ -include/ltdl.h -lib/libltdl.a -lib/libltdl.la -lib/libltdl.so -lib/libltdl.so.4 diff --git a/devel/libltdl15/Makefile b/devel/libltdl22/Makefile index 0c0a63af1df2..06e5f7c48884 100644 --- a/devel/libltdl15/Makefile +++ b/devel/libltdl22/Makefile @@ -6,17 +6,22 @@ # PORTNAME= libltdl -MASTERDIR= ${.CURDIR}/../../devel/libtool15 +MASTERDIR= ${.CURDIR}/../../devel/libtool22 COMMENT= System independent dlopen wrapper +USE_GNOME= ltverhack USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool:22 +LIBTOOLFILES= libltdl/configure CONFIGURE_ARGS= --enable-ltdl-install -BUILD_WRKSRC= ${WRKSRC}/libltdl -INSTALL_WRKSRC= ${WRKSRC}/libltdl + +CONFIGURE_WRKSRC=${WRKSRC}/libltdl +BUILD_WRKSRC= ${CONFIGURE_WRKSRC} +INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -LATEST_LINK= libltdl15 +LATEST_LINK= libltdl22 INFO= # empty .include "${MASTERDIR}/Makefile" diff --git a/devel/libltdl15/pkg-descr b/devel/libltdl22/pkg-descr index e57b99f21a5c..e57b99f21a5c 100644 --- a/devel/libltdl15/pkg-descr +++ b/devel/libltdl22/pkg-descr diff --git a/devel/libltdl22/pkg-plist b/devel/libltdl22/pkg-plist new file mode 100644 index 000000000000..bd6781079532 --- /dev/null +++ b/devel/libltdl22/pkg-plist @@ -0,0 +1,9 @@ +include/libltdl/lt_dlloader.h +include/libltdl/lt_error.h +include/libltdl/lt_system.h +include/ltdl.h +lib/libltdl.a +lib/libltdl.la +lib/libltdl.so +lib/libltdl.so.7 +@dirrm include/libltdl diff --git a/devel/libltdl24/Makefile b/devel/libltdl24/Makefile new file mode 100644 index 000000000000..06e5f7c48884 --- /dev/null +++ b/devel/libltdl24/Makefile @@ -0,0 +1,27 @@ +# New ports collection makefile for: libltdl +# Date created: 23 January 2002 +# Whom: Jeremy Norris <ishmael27x@yahoo.com> +# +# $FreeBSD$ +# + +PORTNAME= libltdl +MASTERDIR= ${.CURDIR}/../../devel/libtool22 + +COMMENT= System independent dlopen wrapper + +USE_GNOME= ltverhack +USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool:22 +LIBTOOLFILES= libltdl/configure +CONFIGURE_ARGS= --enable-ltdl-install + +CONFIGURE_WRKSRC=${WRKSRC}/libltdl +BUILD_WRKSRC= ${CONFIGURE_WRKSRC} +INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +LATEST_LINK= libltdl22 +INFO= # empty + +.include "${MASTERDIR}/Makefile" diff --git a/devel/libltdl24/pkg-descr b/devel/libltdl24/pkg-descr new file mode 100644 index 000000000000..e57b99f21a5c --- /dev/null +++ b/devel/libltdl24/pkg-descr @@ -0,0 +1,9 @@ +This is GNU libltdl, a system independent dlopen wrapper for GNU libtool. + +It supports the following dlopen interfaces: +* dlopen (Solaris, Linux and various BSD flavors) +* shl_load (HP-UX) +* LoadLibrary (Win16 and Win32) +* load_add_on (BeOS) +* GNU DLD (emulates dynamic linking for static libraries) +* libtool's dlpreopen diff --git a/devel/libltdl24/pkg-plist b/devel/libltdl24/pkg-plist new file mode 100644 index 000000000000..bd6781079532 --- /dev/null +++ b/devel/libltdl24/pkg-plist @@ -0,0 +1,9 @@ +include/libltdl/lt_dlloader.h +include/libltdl/lt_error.h +include/libltdl/lt_system.h +include/ltdl.h +lib/libltdl.a +lib/libltdl.la +lib/libltdl.so +lib/libltdl.so.7 +@dirrm include/libltdl diff --git a/devel/libmaa/Makefile b/devel/libmaa/Makefile index a02670a639f7..07da469dc612 100644 --- a/devel/libmaa/Makefile +++ b/devel/libmaa/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes ALL_TARGET= lib diff --git a/devel/libmimedir/Makefile b/devel/libmimedir/Makefile index 6de68b83e1a9..7b48168d5855 100644 --- a/devel/libmimedir/Makefile +++ b/devel/libmimedir/Makefile @@ -14,7 +14,7 @@ COMMENT= Library for parsing RFC2425 MIME Directory Profile information USE_GNOME= gnometarget USE_BISON= build -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes regression-test: diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index 7eeb4c327c88..5ebd4d5e0fcc 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_GNOME= gnomehack gnometarget intlhack glib20 gtk20 ltverhack USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --without-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libnotifymm/Makefile b/devel/libnotifymm/Makefile index 022a9746526a..37eea4609fd5 100644 --- a/devel/libnotifymm/Makefile +++ b/devel/libnotifymm/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gnomehack gnomeprefix ltverhack CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/libnotify `pkg-config --cflags glibmm-2.4 libnotify gtkmm-2.4`" USE_LDCONFIG= yes diff --git a/devel/liboil/Makefile b/devel/liboil/Makefile index 572e29246da4..cfdd3f303d4a 100644 --- a/devel/liboil/Makefile +++ b/devel/liboil/Makefile @@ -15,7 +15,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= Library of optimized inner loops USE_GNOME= pkgconfig gnomehack gnometarget ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtk-doc \ --disable-glib diff --git a/devel/libol/Makefile b/devel/libol/Makefile index 63c45100cea3..ced6b77a9789 100644 --- a/devel/libol/Makefile +++ b/devel/libol/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.balabit.com/downloads/files/libol/0.3/ MAINTAINER= araujo@FreeBSD.org COMMENT= Library needed by syslog-ng -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile index 10dc61305b30..4e03e8eef450 100644 --- a/devel/libole2/Makefile +++ b/devel/libole2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= Support library for OLE functions (MS-Excel) for gnumeric -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= glib12 GNU_CONFIGURE= yes diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile index 705ee552a163..3a14030007df 100644 --- a/devel/liboop/Makefile +++ b/devel/liboop/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \ tcl84.1:${PORTSDIR}/lang/tcl84 \ wwwcore.1:${PORTSDIR}/www/libwww -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= glib12 glib20 gnomehack gnometarget GNU_CONFIGURE= yes diff --git a/devel/libopendaap/Makefile b/devel/libopendaap/Makefile index 0abddf9ec736..f13ef07644bd 100644 --- a/devel/libopendaap/Makefile +++ b/devel/libopendaap/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://crazney.net/programs/itunes/files/ MAINTAINER= multimedia@FreeBSD.org COMMENT= C lib used to connect to iTunes(R) music shares -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes diff --git a/devel/libpeak/Makefile b/devel/libpeak/Makefile index cc26b93c0482..40832acc7f92 100644 --- a/devel/libpeak/Makefile +++ b/devel/libpeak/Makefile @@ -24,6 +24,6 @@ USE_GNOME= gnometarget MAKE_ARGS= CFLAGS="${CFLAGS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ LIBS="${PTHREAD_LIBS}" USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/devel/libphish/Makefile b/devel/libphish/Makefile index 6748fd3f2fac..9ef92ae947f9 100644 --- a/devel/libphish/Makefile +++ b/devel/libphish/Makefile @@ -16,7 +16,7 @@ COMMENT= A cross-platform library to interact with the Open Phishing Database BUILD_DEPENDS= xmlwf:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/devel/libpperl/Makefile b/devel/libpperl/Makefile index 95da97bdde34..6ac7db30f159 100644 --- a/devel/libpperl/Makefile +++ b/devel/libpperl/Makefile @@ -17,7 +17,7 @@ COMMENT= A library easing embedding perl interpreters into C programs WRKSRC= ${WRKDIR}/${PORTNAME} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile index 5f130617410f..bb626ccee9ea 100644 --- a/devel/libredblack/Makefile +++ b/devel/libredblack/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Library that provides the red-black balanced tree algorithm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/librelp/Makefile b/devel/librelp/Makefile index d81f1faa34cc..07ef0d46d0e1 100644 --- a/devel/librelp/Makefile +++ b/devel/librelp/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Reliable event logging protocol library USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes PLIST_FILES= include/${PORTNAME}.h \ diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile index e7b65f9787b7..71daa8997df2 100644 --- a/devel/libshbuf/Makefile +++ b/devel/libshbuf/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Library for Shared Buffer IPC -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile index 22bcdddfc44f..4037059b6021 100644 --- a/devel/libsigc++/Makefile +++ b/devel/libsigc++/Makefile @@ -18,7 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf,gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Callback Framework for C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile index d5537594c84c..0d1bd33d80b1 100644 --- a/devel/libsigc++12/Makefile +++ b/devel/libsigc++12/Makefile @@ -21,7 +21,7 @@ COMMENT= Callback Framework for C++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes LATEST_LINK= libsigc++12 USE_LDCONFIG= yes diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile index 91fe6e6fec2a..d45a5276e872 100644 --- a/devel/libsigc++20/Makefile +++ b/devel/libsigc++20/Makefile @@ -16,7 +16,7 @@ COMMENT= Callback Framework for C++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes LATEST_LINK= libsigc++20 diff --git a/devel/libsigcx/Makefile b/devel/libsigcx/Makefile index e361563f6fb8..a48cbf3e96b6 100644 --- a/devel/libsigcx/Makefile +++ b/devel/libsigcx/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 USE_GNOME= gnomehack gnometarget gtk20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" \ ac_cv_path_DOXYGEN="" USE_LDCONFIG= yes diff --git a/devel/libsigsegv/Makefile b/devel/libsigsegv/Makefile index 518d948b54a6..9447ce6725dd 100644 --- a/devel/libsigsegv/Makefile +++ b/devel/libsigsegv/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= libsigsegv MAINTAINER= perky@FreeBSD.org COMMENT= Handling page faults in user mode -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile index 87540b3370d7..a1dad327df6a 100644 --- a/devel/libsoup/Makefile +++ b/devel/libsoup/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack gconf2 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile index 3384aa48080c..89c8b815b328 100644 --- a/devel/libsoup22/Makefile +++ b/devel/libsoup22/Makefile @@ -23,7 +23,7 @@ NO_LATEST_LINK= yes USE_BZIP2= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack referencehack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/devel/libstrfunc/Makefile b/devel/libstrfunc/Makefile index 6a7d6ba5f415..c3e54c109b8b 100644 --- a/devel/libstrfunc/Makefile +++ b/devel/libstrfunc/Makefile @@ -16,7 +16,7 @@ MAINTAINER= vlm@lionet.info COMMENT= Handles CGI forms, MIME, templates, date conversions, etc USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --program-prefix="" MAN3= \ diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile index f59dfee372c6..8d9486e7302e 100644 --- a/devel/libstroke/Makefile +++ b/devel/libstroke/Makefile @@ -16,7 +16,7 @@ COMMENT= A stroke translation library USE_XORG= x11 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WANT_GNOME= yes USE_LDCONFIG= yes diff --git a/devel/libtap/Makefile b/devel/libtap/Makefile index 9a6f6a7cefb4..f8527f2d5f40 100644 --- a/devel/libtap/Makefile +++ b/devel/libtap/Makefile @@ -16,7 +16,7 @@ DISTNAME= tap-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library implementing the Test Anything Protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile index f90117b8f9a7..283f0db27c86 100644 --- a/devel/libthai/Makefile +++ b/devel/libthai/Makefile @@ -17,7 +17,7 @@ COMMENT= Thai language support library USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22 MAKE_JOBS_UNSAFE= yes ALL_TARGET= all check diff --git a/devel/libticalcs/Makefile b/devel/libticalcs/Makefile index 83b14b9a18eb..9d0289434941 100644 --- a/devel/libticalcs/Makefile +++ b/devel/libticalcs/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= ticables.12:${PORTSDIR}/comms/libticables \ USE_GETTEXT= yes USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/devel/libtifiles/Makefile b/devel/libtifiles/Makefile index 60f7bfc61de0..c92b27728b39 100644 --- a/devel/libtifiles/Makefile +++ b/devel/libtifiles/Makefile @@ -17,7 +17,7 @@ COMMENT= TI calculator file types library USE_GETTEXT= yes USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/devel/libtifiles2/Makefile b/devel/libtifiles2/Makefile index 0daf22fa0932..8526d43bd93b 100644 --- a/devel/libtifiles2/Makefile +++ b/devel/libtifiles2/Makefile @@ -17,7 +17,7 @@ COMMENT= TI calculator file types library LIB_DEPENDS= ticonv.3:${PORTSDIR}/converters/libticonv -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= glib20 gnomehack pkgconfig USE_LDCONFIG= yes diff --git a/devel/libtool15/distinfo b/devel/libtool15/distinfo deleted file mode 100644 index b2248ec76640..000000000000 --- a/devel/libtool15/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (libtool-1.5.26.tar.gz) = aa9c5107f3ec9ef4200eb6556f3b3c29 -SHA256 (libtool-1.5.26.tar.gz) = 1c35ae34fe85aa167bd7ab4bc9f477fe019138e1af62678d952fc43c0b7e2f09 -SIZE (libtool-1.5.26.tar.gz) = 2961939 diff --git a/devel/libtool15/files/patch-libltdl-Makefile.in b/devel/libtool15/files/patch-libltdl-Makefile.in deleted file mode 100644 index 9d7f7886a9d5..000000000000 --- a/devel/libtool15/files/patch-libltdl-Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- libltdl/Makefile.in.orig Sun Dec 18 14:13:58 2005 -+++ libltdl/Makefile.in Wed Feb 28 07:51:13 2007 -@@ -267,7 +267,2 @@ - --$(top_srcdir)/configure: $(am__configure_deps) -- cd $(srcdir) && $(AUTOCONF) --$(ACLOCAL_M4): $(am__aclocal_m4_deps) -- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -- - config.h: stamp-h1 -@@ -282,3 +277,2 @@ - $(srcdir)/config-h.in: $(am__configure_deps) -- cd $(top_srcdir) && $(AUTOHEADER) - rm -f stamp-h1 diff --git a/devel/libtool15/files/patch-libltdl-acinclude.m4 b/devel/libtool15/files/patch-libltdl-acinclude.m4 deleted file mode 100644 index 90dcbc2e40fe..000000000000 --- a/devel/libtool15/files/patch-libltdl-acinclude.m4 +++ /dev/null @@ -1,8 +0,0 @@ ---- libltdl/acinclude.m4.orig Sun Dec 18 14:13:49 2005 -+++ libltdl/acinclude.m4 Tue Jan 30 17:30:22 2007 -@@ -6526,2 +6526,5 @@ - ;; -+ freebsd*) -+ libltdl_cv_sys_dlopen_deplibs=yes -+ ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) diff --git a/devel/libtool15/files/patch-ltdl.m4 b/devel/libtool15/files/patch-ltdl.m4 deleted file mode 100644 index e48e12f3223f..000000000000 --- a/devel/libtool15/files/patch-ltdl.m4 +++ /dev/null @@ -1,8 +0,0 @@ ---- ltdl.m4.orig Sun Dec 18 13:53:17 2005 -+++ ltdl.m4 Tue Jan 30 17:32:06 2007 -@@ -129,2 +129,5 @@ - ;; -+ freebsd*) -+ libltdl_cv_sys_dlopen_deplibs=yes -+ ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) diff --git a/devel/libtool15/pkg-plist b/devel/libtool15/pkg-plist deleted file mode 100644 index b198e3d307fa..000000000000 --- a/devel/libtool15/pkg-plist +++ /dev/null @@ -1,27 +0,0 @@ -@comment $FreeBSD$ -bin/libtool -bin/libtoolize -share/aclocal/libtool.m4 -share/aclocal/ltdl.m4 -share/libtool/config.guess -share/libtool/config.sub -share/libtool/install-sh -share/libtool/libltdl/COPYING.LIB -share/libtool/libltdl/Makefile.am -share/libtool/libltdl/Makefile.in -share/libtool/libltdl/README -share/libtool/libltdl/acinclude.m4 -share/libtool/libltdl/aclocal.m4 -share/libtool/libltdl/config-h.in -share/libtool/libltdl/config.guess -share/libtool/libltdl/config.sub -share/libtool/libltdl/configure -share/libtool/libltdl/configure.ac -share/libtool/libltdl/install-sh -share/libtool/libltdl/ltdl.c -share/libtool/libltdl/ltdl.h -share/libtool/libltdl/ltmain.sh -share/libtool/libltdl/missing -share/libtool/ltmain.sh -@dirrm share/libtool/libltdl -@dirrm share/libtool diff --git a/devel/libtool15/Makefile b/devel/libtool22/Makefile index 98537fd8f4c4..5819e34e3f23 100644 --- a/devel/libtool15/Makefile +++ b/devel/libtool22/Makefile @@ -6,15 +6,16 @@ # PORTNAME?= libtool -PORTVERSION= 1.5.26 +PORTVERSION= 2.2.6a CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool DISTNAME= libtool-${PORTVERSION} -MAINTAINER= ade@FreeBSD.org +MAINTAINER= kwm@FreeBSD.org COMMENT?= Generic shared library support script +WRKSRC= ${WRKDIR}/libtool-${PORTVERSION:S|a||} GNU_CONFIGURE= yes CONFIGURE_ARGS?= --disable-ltdl-install CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" diff --git a/devel/libtool22/distinfo b/devel/libtool22/distinfo new file mode 100644 index 000000000000..817aaa0e67ce --- /dev/null +++ b/devel/libtool22/distinfo @@ -0,0 +1,3 @@ +MD5 (libtool-2.2.6a.tar.gz) = 8ca1ea241cd27ff9832e045fe9afe4fd +SHA256 (libtool-2.2.6a.tar.gz) = eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796 +SIZE (libtool-2.2.6a.tar.gz) = 2870524 diff --git a/devel/libtool22/files/patch-libltdl-Makefile.in b/devel/libtool22/files/patch-libltdl-Makefile.in new file mode 100644 index 000000000000..c7f7983138e7 --- /dev/null +++ b/devel/libtool22/files/patch-libltdl-Makefile.in @@ -0,0 +1,22 @@ +--- libltdl/Makefile.in.orig 2008-09-07 19:56:34.000000000 +0200 ++++ libltdl/Makefile.in 2009-05-12 10:38:05.000000000 +0200 +@@ -385,11 +385,6 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +- + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +@@ -400,7 +395,6 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config-h.in: $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + diff --git a/devel/libtool15/files/patch-ltmain.sh b/devel/libtool22/files/patch-libltdl_config_ltmain.sh index dbfac1c8e3a7..8dc8434921eb 100644 --- a/devel/libtool15/files/patch-ltmain.sh +++ b/devel/libtool22/files/patch-libltdl_config_ltmain.sh @@ -1,7 +1,10 @@ ---- ltmain.sh.orig Sun Dec 18 14:14:54 2005 -+++ ltmain.sh Mon Feb 20 17:37:04 2006 -@@ -228,2 +228,16 @@ +--- libltdl/config/ltmain.sh.orig 2009-06-29 12:36:19.000000000 -0500 ++++ libltdl/config/ltmain.sh 2009-06-29 12:57:44.000000000 -0500 +@@ -1010,6 +1010,21 @@ + func_infer_tag () { + $opt_debug ++ + # FreeBSD-specific: where we install compilers with non-standard names + tag_compilers_CC="*cc cc* *gcc gcc*" + tag_compilers_CXX="*c++ c++* *g++ g++*" @@ -17,7 +20,11 @@ + fi + if test -n "$available_tags" && test -z "$tagname"; then -@@ -268,3 +282,18 @@ + CC_quoted= + for arg in $CC; do +@@ -1042,7 +1057,22 @@ + break + ;; esac - fi + @@ -37,11 +44,36 @@ + fi + fi done -@@ -1606,2 +1635,3 @@ - finalize_command="$finalize_command $arg" + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command +@@ -2528,6 +2558,9 @@ + ;; + esac + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; +@@ -4584,6 +4617,7 @@ + *" $arg "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + esac + deplibs="$deplibs $arg" continue -@@ -2103,2 +2133,25 @@ + ;; + +@@ -5073,13 +5107,30 @@ + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" +- if test "$linkmode" = lib ; then +- case "$new_inherited_linker_flags " in +- *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; +- esac +- fi fi + + case $linkmode in @@ -67,9 +99,5 @@ + esac # linkmode + continue -@@ -4706,2 +4759,5 @@ - esac -+ ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... ;; + -l*) diff --git a/devel/libtool15/pkg-descr b/devel/libtool22/pkg-descr index 1dea88bf6d51..1dea88bf6d51 100644 --- a/devel/libtool15/pkg-descr +++ b/devel/libtool22/pkg-descr diff --git a/devel/libtool22/pkg-plist b/devel/libtool22/pkg-plist new file mode 100644 index 000000000000..d4bbdd78ca36 --- /dev/null +++ b/devel/libtool22/pkg-plist @@ -0,0 +1,56 @@ +bin/libtool +bin/libtoolize +share/aclocal/argz.m4 +share/aclocal/libtool.m4 +share/aclocal/ltdl.m4 +share/aclocal/ltoptions.m4 +share/aclocal/ltsugar.m4 +share/aclocal/ltversion.m4 +share/aclocal/lt~obsolete.m4 +share/libtool/config/compile +share/libtool/config/config.guess +share/libtool/config/config.sub +share/libtool/config/depcomp +share/libtool/config/install-sh +share/libtool/config/ltmain.sh +share/libtool/config/missing +share/libtool/libltdl/COPYING.LIB +share/libtool/libltdl/Makefile.am +share/libtool/libltdl/Makefile.in +share/libtool/libltdl/Makefile.inc +share/libtool/libltdl/README +share/libtool/libltdl/aclocal.m4 +share/libtool/libltdl/argz.c +share/libtool/libltdl/argz_.h +share/libtool/libltdl/config-h.in +share/libtool/libltdl/configure +share/libtool/libltdl/configure.ac +share/libtool/libltdl/libltdl/lt__alloc.h +share/libtool/libltdl/libltdl/lt__dirent.h +share/libtool/libltdl/libltdl/lt__glibc.h +share/libtool/libltdl/libltdl/lt__private.h +share/libtool/libltdl/libltdl/lt__strl.h +share/libtool/libltdl/libltdl/lt_dlloader.h +share/libtool/libltdl/libltdl/lt_error.h +share/libtool/libltdl/libltdl/lt_system.h +share/libtool/libltdl/libltdl/slist.h +share/libtool/libltdl/loaders/dld_link.c +share/libtool/libltdl/loaders/dlopen.c +share/libtool/libltdl/loaders/dyld.c +share/libtool/libltdl/loaders/load_add_on.c +share/libtool/libltdl/loaders/loadlibrary.c +share/libtool/libltdl/loaders/preopen.c +share/libtool/libltdl/loaders/shl_load.c +share/libtool/libltdl/lt__alloc.c +share/libtool/libltdl/lt__dirent.c +share/libtool/libltdl/lt__strl.c +share/libtool/libltdl/lt_dlloader.c +share/libtool/libltdl/lt_error.c +share/libtool/libltdl/ltdl.c +share/libtool/libltdl/ltdl.h +share/libtool/libltdl/slist.c +@dirrm share/libtool/libltdl/loaders +@dirrm share/libtool/libltdl/libltdl +@dirrm share/libtool/libltdl +@dirrm share/libtool/config +@dirrm share/libtool diff --git a/devel/libtool24/Makefile b/devel/libtool24/Makefile new file mode 100644 index 000000000000..5819e34e3f23 --- /dev/null +++ b/devel/libtool24/Makefile @@ -0,0 +1,24 @@ +# New ports collection makefile for: libtool +# Date created: 6 May 1998 +# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp> +# +# $FreeBSD$ +# + +PORTNAME?= libtool +PORTVERSION= 2.2.6a +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNU} +MASTER_SITE_SUBDIR= libtool +DISTNAME= libtool-${PORTVERSION} + +MAINTAINER= kwm@FreeBSD.org +COMMENT?= Generic shared library support script + +WRKSRC= ${WRKDIR}/libtool-${PORTVERSION:S|a||} +GNU_CONFIGURE= yes +CONFIGURE_ARGS?= --disable-ltdl-install +CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" +INFO?= libtool + +.include <bsd.port.mk> diff --git a/devel/libtool24/distinfo b/devel/libtool24/distinfo new file mode 100644 index 000000000000..817aaa0e67ce --- /dev/null +++ b/devel/libtool24/distinfo @@ -0,0 +1,3 @@ +MD5 (libtool-2.2.6a.tar.gz) = 8ca1ea241cd27ff9832e045fe9afe4fd +SHA256 (libtool-2.2.6a.tar.gz) = eb6b8f8272c5a5cad0c7c6b949aa75632f45c295f09b2e1e90b6bce15b32b796 +SIZE (libtool-2.2.6a.tar.gz) = 2870524 diff --git a/devel/libtool24/files/patch-libltdl-Makefile.in b/devel/libtool24/files/patch-libltdl-Makefile.in new file mode 100644 index 000000000000..c7f7983138e7 --- /dev/null +++ b/devel/libtool24/files/patch-libltdl-Makefile.in @@ -0,0 +1,22 @@ +--- libltdl/Makefile.in.orig 2008-09-07 19:56:34.000000000 +0200 ++++ libltdl/Makefile.in 2009-05-12 10:38:05.000000000 +0200 +@@ -385,11 +385,6 @@ + $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +-$(top_srcdir)/configure: $(am__configure_deps) +- cd $(srcdir) && $(AUTOCONF) +-$(ACLOCAL_M4): $(am__aclocal_m4_deps) +- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +- + config.h: stamp-h1 + @if test ! -f $@; then \ + rm -f stamp-h1; \ +@@ -400,7 +395,6 @@ + @rm -f stamp-h1 + cd $(top_builddir) && $(SHELL) ./config.status config.h + $(srcdir)/config-h.in: $(am__configure_deps) +- cd $(top_srcdir) && $(AUTOHEADER) + rm -f stamp-h1 + touch $@ + diff --git a/devel/libtool24/files/patch-libltdl_config_ltmain.sh b/devel/libtool24/files/patch-libltdl_config_ltmain.sh new file mode 100644 index 000000000000..8dc8434921eb --- /dev/null +++ b/devel/libtool24/files/patch-libltdl_config_ltmain.sh @@ -0,0 +1,103 @@ +--- libltdl/config/ltmain.sh.orig 2009-06-29 12:36:19.000000000 -0500 ++++ libltdl/config/ltmain.sh 2009-06-29 12:57:44.000000000 -0500 +@@ -1010,6 +1010,21 @@ + func_infer_tag () + { + $opt_debug ++ ++ # FreeBSD-specific: where we install compilers with non-standard names ++ tag_compilers_CC="*cc cc* *gcc gcc*" ++ tag_compilers_CXX="*c++ c++* *g++ g++*" ++ base_compiler=`set -- "$@"; echo $1` ++ ++ # If $tagname isn't set, then try to infer if the default "CC" tag applies ++ if test -z "$tagname"; then ++ for zp in $tag_compilers_CC; do ++ case $base_compiler in ++ $zp) tagname="CC"; break;; ++ esac ++ done ++ fi ++ + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do +@@ -1042,7 +1057,22 @@ + break + ;; + esac +- fi ++ ++ # FreeBSD-specific: try compilers based on inferred tag ++ if test -z "$tagname"; then ++ eval "tag_compilers=\$tag_compilers_${z}" ++ if test -n "$tag_compilers"; then ++ for zp in $tag_compilers; do ++ case $base_compiler in ++ $zp) tagname=$z; break;; ++ esac ++ done ++ if test -n "$tagname"; then ++ break ++ fi ++ fi ++ fi ++ fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command +@@ -2528,6 +2558,9 @@ + ;; + esac + ;; ++ *-*-freebsd*) ++ # FreeBSD doesn't need this... ++ ;; + *) + func_fatal_error "unknown suffix for \`$my_dlsyms'" + ;; +@@ -4584,6 +4617,7 @@ + *" $arg "*) ;; + * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + esac ++ deplibs="$deplibs $arg" + continue + ;; + +@@ -5073,13 +5107,30 @@ + finalize_deplibs="$deplib $finalize_deplibs" + else + compiler_flags="$compiler_flags $deplib" +- if test "$linkmode" = lib ; then +- case "$new_inherited_linker_flags " in +- *" $deplib "*) ;; +- * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; +- esac +- fi + fi ++ ++ case $linkmode in ++ lib) ++ deplibs="$deplib $deplibs" ++ test "$pass" = conv && continue ++ newdependency_libs="$deplib $newdependency_libs" ++ ;; ++ prog) ++ if test "$pass" = conv; then ++ deplibs="$deplib $deplibs" ++ continue ++ fi ++ if test "$pass" = scan; then ++ deplibs="$deplib $deplibs" ++ else ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ fi ++ ;; ++ *) ++ ;; ++ esac # linkmode ++ + continue + ;; + -l*) diff --git a/devel/libtool24/pkg-descr b/devel/libtool24/pkg-descr new file mode 100644 index 000000000000..1dea88bf6d51 --- /dev/null +++ b/devel/libtool24/pkg-descr @@ -0,0 +1,8 @@ +This is GNU Libtool, a generic library support script. Libtool hides +the complexity of using shared libraries behind a consistent, portable +interface. + +To use libtool, add the new generic library building commands to your +Makefile, Makefile.in, or Makefile.am. + +WWW: http://www.gnu.org/software/libtool/ diff --git a/devel/libtool24/pkg-plist b/devel/libtool24/pkg-plist new file mode 100644 index 000000000000..d4bbdd78ca36 --- /dev/null +++ b/devel/libtool24/pkg-plist @@ -0,0 +1,56 @@ +bin/libtool +bin/libtoolize +share/aclocal/argz.m4 +share/aclocal/libtool.m4 +share/aclocal/ltdl.m4 +share/aclocal/ltoptions.m4 +share/aclocal/ltsugar.m4 +share/aclocal/ltversion.m4 +share/aclocal/lt~obsolete.m4 +share/libtool/config/compile +share/libtool/config/config.guess +share/libtool/config/config.sub +share/libtool/config/depcomp +share/libtool/config/install-sh +share/libtool/config/ltmain.sh +share/libtool/config/missing +share/libtool/libltdl/COPYING.LIB +share/libtool/libltdl/Makefile.am +share/libtool/libltdl/Makefile.in +share/libtool/libltdl/Makefile.inc +share/libtool/libltdl/README +share/libtool/libltdl/aclocal.m4 +share/libtool/libltdl/argz.c +share/libtool/libltdl/argz_.h +share/libtool/libltdl/config-h.in +share/libtool/libltdl/configure +share/libtool/libltdl/configure.ac +share/libtool/libltdl/libltdl/lt__alloc.h +share/libtool/libltdl/libltdl/lt__dirent.h +share/libtool/libltdl/libltdl/lt__glibc.h +share/libtool/libltdl/libltdl/lt__private.h +share/libtool/libltdl/libltdl/lt__strl.h +share/libtool/libltdl/libltdl/lt_dlloader.h +share/libtool/libltdl/libltdl/lt_error.h +share/libtool/libltdl/libltdl/lt_system.h +share/libtool/libltdl/libltdl/slist.h +share/libtool/libltdl/loaders/dld_link.c +share/libtool/libltdl/loaders/dlopen.c +share/libtool/libltdl/loaders/dyld.c +share/libtool/libltdl/loaders/load_add_on.c +share/libtool/libltdl/loaders/loadlibrary.c +share/libtool/libltdl/loaders/preopen.c +share/libtool/libltdl/loaders/shl_load.c +share/libtool/libltdl/lt__alloc.c +share/libtool/libltdl/lt__dirent.c +share/libtool/libltdl/lt__strl.c +share/libtool/libltdl/lt_dlloader.c +share/libtool/libltdl/lt_error.c +share/libtool/libltdl/ltdl.c +share/libtool/libltdl/ltdl.h +share/libtool/libltdl/slist.c +@dirrm share/libtool/libltdl/loaders +@dirrm share/libtool/libltdl/libltdl +@dirrm share/libtool/libltdl +@dirrm share/libtool/config +@dirrm share/libtool diff --git a/devel/libukcprog/Makefile b/devel/libukcprog/Makefile index e596c7c5c980..2492bf4c2840 100644 --- a/devel/libukcprog/Makefile +++ b/devel/libukcprog/Makefile @@ -21,7 +21,7 @@ COMMENT= Generally useful low level routines NO_CDROM= License (see source) does not permit selling for profit -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN3= ukcprog.3 DIST_SUBDIR= i-scream GNU_CONFIGURE= yes diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile index f09858a54120..9808f171fe1e 100644 --- a/devel/libunicode/Makefile +++ b/devel/libunicode/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome MAINTAINER= gnome@FreeBSD.org COMMENT= A library for manipulating Unicode characters and strings -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/libusb/Makefile b/devel/libusb/Makefile index fef64e7d2fb4..f8f7faccf671 100644 --- a/devel/libusb/Makefile +++ b/devel/libusb/Makefile @@ -34,9 +34,9 @@ CONFIGURE_ARGS= --disable-build-docs PLIST_SUB= SGML="@comment " .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' ${WRKSRC}/configure diff --git a/devel/libvanessa_adt/Makefile b/devel/libvanessa_adt/Makefile index 16fd765765c7..e937ee58e001 100644 --- a/devel/libvanessa_adt/Makefile +++ b/devel/libvanessa_adt/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger USE_LDCONFIG= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= YES CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/libvanessa_logger/Makefile b/devel/libvanessa_logger/Makefile index 345002246d95..c78a805e19c5 100644 --- a/devel/libvanessa_logger/Makefile +++ b/devel/libvanessa_logger/Makefile @@ -15,7 +15,7 @@ DISTNAME= vanessa_logger-${PORTVERSION} MAINTAINER= thomas@bsdunix.ch COMMENT= Library that provides a generic logging layer -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES GNU_CONFIGURE= YES diff --git a/devel/libvanessa_socket/Makefile b/devel/libvanessa_socket/Makefile index 678fab625b06..eba2aec85418 100644 --- a/devel/libvanessa_socket/Makefile +++ b/devel/libvanessa_socket/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= vanessa_logger.0:${PORTSDIR}/devel/libvanessa_logger \ MAN1= vanessa_socket_pipe.1 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES GNU_CONFIGURE= YES CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/libvc/Makefile b/devel/libvc/Makefile index 5ad41602c464..444dd84ee7fb 100644 --- a/devel/libvc/Makefile +++ b/devel/libvc/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= rolo MAINTAINER= ports@FreeBSD.org COMMENT= A vCard library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_BISON= build GNU_CONFIGURE= yes diff --git a/devel/libytnef/Makefile b/devel/libytnef/Makefile index 416e3bc41ade..0a39e5c1d459 100644 --- a/devel/libytnef/Makefile +++ b/devel/libytnef/Makefile @@ -16,7 +16,7 @@ MAINTAINER= delphus@gmail.com COMMENT= Unpack data in MS Outlook TNEF format GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes PORTDOCS= AUTHORS NEWS README diff --git a/devel/lmdbg/Makefile b/devel/lmdbg/Makefile index c39c5184ffa8..d89a50c47367 100644 --- a/devel/lmdbg/Makefile +++ b/devel/lmdbg/Makefile @@ -16,7 +16,7 @@ COMMENT= Lightweight malloc debugger HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-install: .if !defined(NOPORTDOCS) diff --git a/devel/log4c/Makefile b/devel/log4c/Makefile index c390055217cb..f5235012d20e 100644 --- a/devel/log4c/Makefile +++ b/devel/log4c/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Logging for C Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile index 867abb404619..7a4e89f145e4 100644 --- a/devel/log4cplus/Makefile +++ b/devel/log4cplus/Makefile @@ -16,7 +16,7 @@ DISTFILES= log4cplus-${PORTVERSION}.tar.gz log4cplus-${PORTVERSION}-docs.tar.gz MAINTAINER= petri.totterman@hmv.fi COMMENT= A logging library for C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile index 475ed9531b41..9a8e220d1f52 100644 --- a/devel/log4cpp/Makefile +++ b/devel/log4cpp/Makefile @@ -14,12 +14,11 @@ MASTER_SITES= SF MAINTAINER= clsung@FreeBSD.org COMMENT= A library of C++ classes for flexible logging -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-pthreads --disable-html-docs -MAKE_ENV+= RM=${RM} USE_LDCONFIG= yes .include "Makefile.man" diff --git a/devel/log4cxx/Makefile b/devel/log4cxx/Makefile index b90ee33105a2..edf374182a11 100644 --- a/devel/log4cxx/Makefile +++ b/devel/log4cxx/Makefile @@ -29,7 +29,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/include/boost/regex.hpp:${PORTSDIR}/devel/boost-lib CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib .endif -USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22 AUTOMAKE_ARGS= --add-missing LIBTOOL_VARS= --force --automake diff --git a/devel/log4shib/Makefile b/devel/log4shib/Makefile index 5cc4b5d75ca8..bf55e6cee07b 100644 --- a/devel/log4shib/Makefile +++ b/devel/log4shib/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://shibboleth.internet2.edu/downloads/${PORTNAME}/${DISTVERSIO MAINTAINER= vanilla@FreeBSD.org COMMENT= A library of C++ classes for flexible logging -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnometarget gnomehack diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 562fe3a5ad84..5e401edc9971 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -25,7 +25,7 @@ MAKE_JOBS_UNSAFE= yes USE_XORG= xaw xft xt USE_GNOME= gnometarget libxml2 pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" USE_LDCONFIG= yes diff --git a/devel/memcheck/Makefile b/devel/memcheck/Makefile index 6f3ca207be7f..7a399c306172 100644 --- a/devel/memcheck/Makefile +++ b/devel/memcheck/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://hald.dnsalias.net/projects/memcheck/ MAINTAINER= demon@FreeBSD.org COMMENT= Memory Allocation Checker -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/mimir/Makefile b/devel/mimir/Makefile index 710a9fd3bb50..50019597991b 100644 --- a/devel/mimir/Makefile +++ b/devel/mimir/Makefile @@ -15,7 +15,7 @@ COMMENT= Data-structure library used by the Elan Programming Environment MAN1= dcg.1 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/mq4cpp/Makefile b/devel/mq4cpp/Makefile index a393632934a0..767b3e64a3dd 100644 --- a/devel/mq4cpp/Makefile +++ b/devel/mq4cpp/Makefile @@ -14,7 +14,7 @@ MAINTAINER= vanilla@FreeBSD.org COMMENT= Message Queuing for C++ USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig ltverhack USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/devel/ncnf/Makefile b/devel/ncnf/Makefile index eb9fb76fc66d..0bacca44bc67 100644 --- a/devel/ncnf/Makefile +++ b/devel/ncnf/Makefile @@ -17,7 +17,7 @@ COMMENT= Generic configuration management library LIB_DEPENDS= strfunc.9:${PORTSDIR}/devel/libstrfunc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES GNU_CONFIGURE= yes diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile index 43e9f3099f3d..7efffc17a8d2 100644 --- a/devel/oaf/Makefile +++ b/devel/oaf/Makefile @@ -19,7 +19,7 @@ COMMENT= Object Activation Framework for GNOME LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gtk12 orbit libxml diff --git a/devel/ois/Makefile b/devel/ois/Makefile index 715786b65eec..f69d5ed7f1ce 100644 --- a/devel/ois/Makefile +++ b/devel/ois/Makefile @@ -18,7 +18,7 @@ COMMENT= Object Oriented Input System GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack -USE_AUTOTOOLS= libtool:15:env aclocal:19:env autoheader:262:env automake:19:env autoconf:262:env +USE_AUTOTOOLS= libtool:22:env aclocal:19:env autoheader:262:env automake:19:env autoconf:262:env USE_XORG= x11 xaw USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/devel/open-beagle/Makefile b/devel/open-beagle/Makefile index 7810e482820c..b74a75a96b53 100644 --- a/devel/open-beagle/Makefile +++ b/devel/open-beagle/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An Evolutionary Computation Framework CONFLICTS= beagle-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-optimization --with-zlib=/usr USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile index 38cd00906f70..618f40fee90f 100644 --- a/devel/openzz/Makefile +++ b/devel/openzz/Makefile @@ -19,7 +19,7 @@ COMMENT= An interpreted dynamic parser WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile index 504b51b32389..bd8976e7c770 100644 --- a/devel/orbitcpp/Makefile +++ b/devel/orbitcpp/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack ltverhack orbit2 GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS =.*\)test\(.*\)|\1\2|' ${WRKSRC}/Makefile.in diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile index fd0b2d71575b..1daf3c49cbf4 100644 --- a/devel/pcre++/Makefile +++ b/devel/pcre++/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre PCRE_CONFIG?= ${LOCALBASE}/bin/pcre-config -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="`${PCRE_CONFIG} --cflags`" \ diff --git a/devel/php-java-bridge/Makefile b/devel/php-java-bridge/Makefile index 8679c0e20e36..6802c8a8736b 100644 --- a/devel/php-java-bridge/Makefile +++ b/devel/php-java-bridge/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= chinsan@FreeBSD.org COMMENT= PHP module wich connects the PHP object with the Java/ECMA 335 object -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22:env GNU_CONFIGURE= yes USE_GMAKE= yes USE_JAVA= yes @@ -36,16 +36,12 @@ post-install: ${PREFIX}/lib/php/${PHP_EXT_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/modules/RunJavaBridge \ ${PREFIX}/lib/php/${PHP_EXT_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/modules/libnatcJavaBridge.a \ - ${PREFIX}/lib/php/${PHP_EXT_DIR} ${INSTALL_PROGRAM} ${WRKSRC}/modules/libnatcJavaBridge.so \ ${PREFIX}/lib/php/${PHP_EXT_DIR} ${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/JavaBridge.jar" \ >> ${TMPPLIST} ${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/RunJavaBridge" \ >> ${TMPPLIST} - ${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/libnatcJavaBridge.a" \ - >> ${TMPPLIST} ${ECHO_CMD} "lib/php/${PHP_EXT_DIR}/libnatcJavaBridge.so" \ >> ${TMPPLIST} diff --git a/devel/physfs-devel/Makefile b/devel/physfs-devel/Makefile index b12b3589e010..9915b09ec559 100644 --- a/devel/physfs-devel/Makefile +++ b/devel/physfs-devel/Makefile @@ -15,7 +15,7 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A library to provide abstract access to various archives USE_CMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes NO_LATEST_LINK= yes diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index df8366be128f..d94cc022a0e4 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -14,7 +14,7 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= A library to provide abstract access to various archives USE_CMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes patch-autotools: diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile index a54f1989c0e3..089767eac1ca 100644 --- a/devel/pikdev/Makefile +++ b/devel/pikdev/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils USE_KDEBASE_VER=3 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} CPPFLAGS+= -I${LOCALBASE}/include diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile index d889f42f9672..3f6dbbe09e0c 100644 --- a/devel/piklab/Makefile +++ b/devel/piklab/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=piklab MAINTAINER= ports@FreeBSD.org COMMENT= KDE IDE for microcontroller development -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_KDELIBS_VER=3 diff --git a/devel/popt/Makefile b/devel/popt/Makefile index b859671cf284..2486716feea7 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --with-libiconv-prefix=${LOCALBASE} \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN3= popt.3 diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile index 8435d9515819..a0c22fea415b 100644 --- a/devel/poslib/Makefile +++ b/devel/poslib/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= posadis MAINTAINER= ports@FreeBSD.org COMMENT= Posadis C++ DNS library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile index f16c9a5d4ceb..a254e7282fe4 100644 --- a/devel/ppl/Makefile +++ b/devel/ppl/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 USE_GMAKE= yes USE_GNOME= gnometarget USE_PERL5_BUILD=yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure Watchdog/configure USE_GCC= 4.2+ diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile index a365f0a832cf..a2d1c2fed99a 100644 --- a/devel/prepstools/Makefile +++ b/devel/prepstools/Makefile @@ -16,7 +16,7 @@ COMMENT= Problem reporting system RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PGSQL= yes USE_GMAKE= yes USE_GNOME= gtk20 gconf2 glib20 libgnomeui diff --git a/devel/present/Makefile b/devel/present/Makefile index 039a411c9fee..fbcb4e2d4f97 100644 --- a/devel/present/Makefile +++ b/devel/present/Makefile @@ -18,7 +18,7 @@ COMMENT= A library for reading Microsoft PowerPoint(tm) documents LIB_DEPENDS= goffice-1.2:${PORTSDIR}/devel/goffice1 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/devel/privman/Makefile b/devel/privman/Makefile index 0c725b5fd492..2ebcaf34bce3 100644 --- a/devel/privman/Makefile +++ b/devel/privman/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.isso.sparta.com/opensource/privman/downloads/ MAINTAINER= ports@FreeBSD.org COMMENT= Library that makes it easy for programs to use privilege separation -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile index 06ab780d8902..68fb903b89a4 100644 --- a/devel/py-dbus/Makefile +++ b/devel/py-dbus/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_GNOME= gnomehack gnometarget USE_PYTHON= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${PYTHON_INCLUDEDIR}" CONFIGURE_ARGS= --docdir=${DOCSDIR} diff --git a/devel/py-subversion/pkg-plist b/devel/py-subversion/pkg-plist index 478521e0d6d1..297499a1a5c4 100644 --- a/devel/py-subversion/pkg-plist +++ b/devel/py-subversion/pkg-plist @@ -4,28 +4,20 @@ lib/libsvn_swig_py-1.so lib/libsvn_swig_py-1.so.0 %%PYTHON_SITELIBDIR%%/libsvn/__init__.py %%PYTHON_SITELIBDIR%%/libsvn/__init__.pyc -%%PYTHON_SITELIBDIR%%/libsvn/_client.a %%PYTHON_SITELIBDIR%%/libsvn/_client.la %%PYTHON_SITELIBDIR%%/libsvn/_client.so -%%PYTHON_SITELIBDIR%%/libsvn/_core.a %%PYTHON_SITELIBDIR%%/libsvn/_core.la %%PYTHON_SITELIBDIR%%/libsvn/_core.so -%%PYTHON_SITELIBDIR%%/libsvn/_delta.a %%PYTHON_SITELIBDIR%%/libsvn/_delta.la %%PYTHON_SITELIBDIR%%/libsvn/_delta.so -%%PYTHON_SITELIBDIR%%/libsvn/_diff.a %%PYTHON_SITELIBDIR%%/libsvn/_diff.la %%PYTHON_SITELIBDIR%%/libsvn/_diff.so -%%PYTHON_SITELIBDIR%%/libsvn/_fs.a %%PYTHON_SITELIBDIR%%/libsvn/_fs.la %%PYTHON_SITELIBDIR%%/libsvn/_fs.so -%%PYTHON_SITELIBDIR%%/libsvn/_ra.a %%PYTHON_SITELIBDIR%%/libsvn/_ra.la %%PYTHON_SITELIBDIR%%/libsvn/_ra.so -%%PYTHON_SITELIBDIR%%/libsvn/_repos.a %%PYTHON_SITELIBDIR%%/libsvn/_repos.la %%PYTHON_SITELIBDIR%%/libsvn/_repos.so -%%PYTHON_SITELIBDIR%%/libsvn/_wc.a %%PYTHON_SITELIBDIR%%/libsvn/_wc.la %%PYTHON_SITELIBDIR%%/libsvn/_wc.so %%PYTHON_SITELIBDIR%%/libsvn/client.py diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile index a1b6b47c07e0..d0d36f758079 100644 --- a/devel/raknet/Makefile +++ b/devel/raknet/Makefile @@ -20,7 +20,7 @@ COMMENT= Networking API that provides reliable UDP primarily for online games USE_ZIP= yes NO_WRKSUBDIR= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= aclocal:110 autoheader:262 autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 autoconf:262 automake:110 libtool:22 AUTOMAKE_ARGS= --add-missing ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} \ -I ${LOCALBASE}/share/aclocal \ diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index b0298097e32a..efcc23ecea3f 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -23,7 +23,7 @@ USE_WX= 2.6 WX_CONF_ARGS= absolute GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 automake:19 +USE_AUTOTOOLS= autoconf:262 libtool:22 automake:19 CONFIGURE_TARGET= CONFIGURE_ARGS= --with-apr-config=apr-1-config \ --with-apu-config=apu-1-config \ diff --git a/devel/regexx/Makefile b/devel/regexx/Makefile index 0edd34e4c2eb..f899f4d0f9cb 100644 --- a/devel/regexx/Makefile +++ b/devel/regexx/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A complete regular expressions C++ solution USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAKE_ENV+= INCLUDES="-I${WRKSRC}/pcre" diff --git a/devel/rlog/Makefile b/devel/rlog/Makefile index 541526df0594..630a1399c659 100644 --- a/devel/rlog/Makefile +++ b/devel/rlog/Makefile @@ -14,7 +14,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= trasz@FreeBSD.org COMMENT= A flexible message logging facility for C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= gnomehack diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile index 6611519cda77..5eaf485acb7e 100644 --- a/devel/rudiments/Makefile +++ b/devel/rudiments/Makefile @@ -16,7 +16,7 @@ COMMENT= A utility C++ class library for daemons, clients, servers and more USE_GNOME= gnometarget pkgconfig USE_OPENSSL= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREADINCLUDES="${PTHREAD_CFLAGS}" \ PTHREADLIB="${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-ssl-includes=-I${OPENSSLINC} \ diff --git a/devel/safestr/Makefile b/devel/safestr/Makefile index e55f1b3ddf18..947d23aac774 100644 --- a/devel/safestr/Makefile +++ b/devel/safestr/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xxl.2:${PORTSDIR}/devel/xxl:install CONFIGURE_ARGS= --with-xxl=${LOCALBASE} GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .if !defined(NOPORTDOCS) diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index 298b1a72772b..c3a3640ccaaf 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -18,7 +18,7 @@ COMMENT= Cross-platform multimedia development API BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes WANT_GNOME= yes diff --git a/devel/sdlmm/Makefile b/devel/sdlmm/Makefile index 81ccb5c7431a..8c94c7677693 100644 --- a/devel/sdlmm/Makefile +++ b/devel/sdlmm/Makefile @@ -17,7 +17,7 @@ DISTNAME= SDLmm-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile index 7478df019e84..9e5c5e704706 100644 --- a/devel/sdts++/Makefile +++ b/devel/sdts++/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ library for SDTS related development LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/shapelib/Makefile b/devel/shapelib/Makefile index e0f07e1b9304..259400b3936a 100644 --- a/devel/shapelib/Makefile +++ b/devel/shapelib/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://dl.maptools.org/dl/shapelib/ \ MAINTAINER= sunpoet@sunpoet.net COMMENT= C API for reading and writing ArcView Shapefiles -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env USE_LDCONFIG= yes OPTIONS= PROJ4 "Cartographic Projections library" off diff --git a/devel/shmap/Makefile b/devel/shmap/Makefile index 7d1b10d363cd..d6ef7906d19a 100644 --- a/devel/shmap/Makefile +++ b/devel/shmap/Makefile @@ -18,7 +18,7 @@ COMMENT= Shared-memory-based hashmaps LIB_DEPENDS= mm.14:${PORTSDIR}/devel/mm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 42083004f76e..5f6d2683208f 100644 --- a/devel/silc-toolkit/Makefile +++ b/devel/silc-toolkit/Makefile @@ -24,7 +24,7 @@ COMMENT= Secure Internet Live Conferencing (SILC) network toolkit CONFLICTS= silc-client-1.1.* silc-irssi-client-1.1.* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_PERL5= yes GNU_CONFIGURE= yes diff --git a/devel/soup/Makefile b/devel/soup/Makefile index 619359d2716a..133ef1d7b8a4 100644 --- a/devel/soup/Makefile +++ b/devel/soup/Makefile @@ -17,7 +17,7 @@ COMMENT= A SOAP (Simple Object Access Protocol) implementation in C LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnomehack glib12 libxml USE_LDCONFIG= yes diff --git a/devel/spatialindex/Makefile b/devel/spatialindex/Makefile index 2ce3ea603994..3fee14dade34 100644 --- a/devel/spatialindex/Makefile +++ b/devel/spatialindex/Makefile @@ -11,7 +11,7 @@ MASTER_SITES= http://www.edu-linux.org/down/ MAINTAINER= wenheping@gmail.com COMMENT= A General Framework for Developing Spatial Indices -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/devel/stringencoders/Makefile b/devel/stringencoders/Makefile index bd736f3ad01a..5c0e5a3ee3a9 100644 --- a/devel/stringencoders/Makefile +++ b/devel/stringencoders/Makefile @@ -17,6 +17,6 @@ COMMENT= Collection of high performance c-string transformations USE_PERL5= yes HAS_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/devel/styx/Makefile b/devel/styx/Makefile index e02d383420f3..a6bcb207f807 100644 --- a/devel/styx/Makefile +++ b/devel/styx/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.speculate.de/styx/ MAINTAINER= ports@FreeBSD.org COMMENT= A scanner/parser generator -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index be40cf906998..6b1d825a444a 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -15,7 +15,7 @@ DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAKE_JOBS_SAFE= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-ssl diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index be40cf906998..6b1d825a444a 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -15,7 +15,7 @@ DIST_SUBDIR= subversion EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAKE_JOBS_SAFE= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-ssl diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile index 9addab550e53..73604f90e64d 100644 --- a/devel/swig13/Makefile +++ b/devel/swig13/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= rafan@FreeBSD.org COMMENT= Simplified Wrapper and Interface Generator -USE_AUTOTOOLS= autoconf:262:env libtool:15 +USE_AUTOTOOLS= autoconf:262:env libtool:22 MAN1= ccache-swig.1 diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile index 9addab550e53..73604f90e64d 100644 --- a/devel/swig20/Makefile +++ b/devel/swig20/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= rafan@FreeBSD.org COMMENT= Simplified Wrapper and Interface Generator -USE_AUTOTOOLS= autoconf:262:env libtool:15 +USE_AUTOTOOLS= autoconf:262:env libtool:22 MAN1= ccache-swig.1 diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile index b067b766a01b..34922f4ebae7 100644 --- a/devel/t1lib/Makefile +++ b/devel/t1lib/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Type 1 Rasterizer Library for UNIX/X11 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= without_doc USE_LDCONFIG= yes diff --git a/devel/ta-lib/Makefile b/devel/ta-lib/Makefile index b1b74ad4f8f4..260201630ed5 100644 --- a/devel/ta-lib/Makefile +++ b/devel/ta-lib/Makefile @@ -17,7 +17,7 @@ COMMENT= A UNIX, POSIX Library for Technical Analysis WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile index 461ff42ce461..f81ab3026f55 100644 --- a/devel/tclreadline/Makefile +++ b/devel/tclreadline/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GNU readline for TCL USE_TCL= 82+ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes MANN= tclreadline.n diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile index fab6a89c8073..c3635faaaf13 100644 --- a/devel/thrift/Makefile +++ b/devel/thrift/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs \ event-1.4:${PORTSDIR}/devel/libevent USE_AUTOTOOLS= autoconf:262:env autoheader:262:env aclocal:19:env \ - automake:19:env libtool:15:env + automake:19:env libtool:22:env USE_GNOME= pkgconfig USE_BZIP2= yes USE_GCC= 4.2+ diff --git a/devel/towitoko/Makefile b/devel/towitoko/Makefile index 9625be502034..d3799fa16e96 100644 --- a/devel/towitoko/Makefile +++ b/devel/towitoko/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.geocities.com/cprados/files/ MAINTAINER= ports@FreeBSD.org COMMENT= UNIX driver for Towitoko smartcard readers -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/devel/umem/Makefile b/devel/umem/Makefile index e1570ddfd2e6..1cc2a7a5f6ef 100644 --- a/devel/umem/Makefile +++ b/devel/umem/Makefile @@ -15,7 +15,7 @@ COMMENT= A port of the Solaris memory allocator USE_BZIP2= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ONLY_FOR_ARCHS= i386 amd64 post-patch: diff --git a/devel/upnp/Makefile b/devel/upnp/Makefile index dd35027c2c1f..287ba5a2cc2a 100644 --- a/devel/upnp/Makefile +++ b/devel/upnp/Makefile @@ -17,7 +17,7 @@ COMMENT= Universal Plug and Play Software Development Kit CONFLICTS= upnp-1.0.* USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_DOS2UNIX= yes diff --git a/devel/vstr/Makefile b/devel/vstr/Makefile index d310700a5caa..a3b1d6153f31 100644 --- a/devel/vstr/Makefile +++ b/devel/vstr/Makefile @@ -16,7 +16,7 @@ MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \ MAINTAINER= ports@FreeBSD.org COMMENT= General purpose string library for C -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/devel/wand-libconfig/Makefile b/devel/wand-libconfig/Makefile index ef79e6e17405..46e9d93032b2 100644 --- a/devel/wand-libconfig/Makefile +++ b/devel/wand-libconfig/Makefile @@ -15,7 +15,7 @@ PKGNAMEPREFIX= wand- MAINTAINER= matt@peterson.org COMMENT= C library for parsing config files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/devel/xlslib/Makefile b/devel/xlslib/Makefile index 78324da40dce..98ec820b5d8b 100644 --- a/devel/xlslib/Makefile +++ b/devel/xlslib/Makefile @@ -16,7 +16,7 @@ COMMENT= A C++ library for generation of Excel(TM) files GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|^\(SUBDIRS.*src\).*|\1|' \ diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile index d223e36d47a4..a4eae62e0916 100644 --- a/devel/xparam/Makefile +++ b/devel/xparam/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A general-purpose tool for parameter handling in C++ USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/devel/xxl/Makefile b/devel/xxl/Makefile index 6089c32324e3..a030116b9311 100644 --- a/devel/xxl/Makefile +++ b/devel/xxl/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.zork.org/software/ MAINTAINER= stas@FreeBSD.org COMMENT= C/C++ library for exception handling and asset management -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gnometarget USE_LDCONFIG= yes diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile index bfd0778b96fb..67a02c561ae4 100644 --- a/devel/zthread/Makefile +++ b/devel/zthread/Makefile @@ -15,7 +15,7 @@ DISTNAME= ZThread-${PORTVERSION} MAINTAINER= glarkin@FreeBSD.org COMMENT= A platform-independent object-oriented C++ threading library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-ftime --disable-static USE_GMAKE= yes diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile index 55ef1522bbb1..84662a9e9d28 100644 --- a/dns/hesiod/Makefile +++ b/dns/hesiod/Makefile @@ -22,7 +22,7 @@ MAN3= hesiod.3 hesiod_end.3 hesiod_free_list.3 \ hesiod_free_string.3 hesiod_parse_result.3 MAN5= hesiod.conf.5 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile index 98cc09dec51f..28c6eee1910d 100644 --- a/dns/idnkit/Makefile +++ b/dns/idnkit/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= A library to handle internationalized domain names -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} \ diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile index 85e85e5860f5..65e4a731006a 100644 --- a/dns/ldns/Makefile +++ b/dns/ldns/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ MAINTAINER= konstantin@saurbier.net COMMENT= A library for programs conforming to DNS RFCs and drafts -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/dns/nss_mdns/Makefile b/dns/nss_mdns/Makefile index fc7cb5932b45..ba70035bb131 100644 --- a/dns/nss_mdns/Makefile +++ b/dns/nss_mdns/Makefile @@ -15,7 +15,7 @@ DISTNAME= nss-mdns-${PORTVERSION} MAINTAINER= wahjava@gmail.com COMMENT= NSS module implementing multicast DNS name resolution -USE_AUTOTOOLS= autoconf:262 automake:19 libtool:15 +USE_AUTOTOOLS= autoconf:262 automake:19 libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/dns/posadis/Makefile b/dns/posadis/Makefile index 2bde6944d6a6..8f433730b9a2 100644 --- a/dns/posadis/Makefile +++ b/dns/posadis/Makefile @@ -7,7 +7,7 @@ PORTNAME= posadis PORTVERSION= 0.60.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns ipv6 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ COMMENT= Domain Name Server (DNS) implementation LIB_DEPENDS= poslib.0:${PORTSDIR}/devel/poslib -USE_AUTOTOOLS= autoconf:262 libltdl:15 libtool:15 +USE_AUTOTOOLS= autoconf:262 libltdl:22 libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index 0c4b366b0c83..6d637fe1aa9b 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -26,7 +26,7 @@ CONFLICTS= powerdns-[0-2]* USE_GMAKE= YES USE_SUBMAKE= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index 7e59c5de5c1b..707bf863fa49 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -23,7 +23,7 @@ CONFLICTS= powerdns-devel-[0-9]* USE_GMAKE= YES USE_SUBMAKE= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 7e2301ffb752..d590f08d7f25 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -31,7 +31,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \ wv2.2:${PORTSDIR}/textproc/wv2 RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile index f081d079e4ee..37f6aef04aaf 100644 --- a/editors/cooledit/Makefile +++ b/editors/cooledit/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/editors/X/cooledit MAINTAINER= ports@FreeBSD.org COMMENT= Suite of utilities, including a GUI editor -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile index da75abe5058b..d15420327274 100644 --- a/editors/gedit-plugins/Makefile +++ b/editors/gedit-plugins/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnomeprefix intlhack gnomevfs2 WANT_GNOME= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile index efbecc0d9c10..0ecc96fe8cb0 100644 --- a/editors/gedit/Makefile +++ b/editors/gedit/Makefile @@ -26,7 +26,7 @@ USE_GETTEXT= yes INSTALLS_OMF= yes USE_LDCONFIG= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \ desktopfileutils gnomedocutils ltasneededhack WANT_GNOME= yes diff --git a/editors/gphpedit/Makefile b/editors/gphpedit/Makefile index cae0cdd52592..7548481789d7 100644 --- a/editors/gphpedit/Makefile +++ b/editors/gphpedit/Makefile @@ -18,7 +18,7 @@ COMMENT= PHP, HTML and CSS development environment for GNOME 2.x USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeui libgtkhtml -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/editors/kate-plugins/Makefile b/editors/kate-plugins/Makefile index aac13eba5333..26b6e75ae6ec 100644 --- a/editors/kate-plugins/Makefile +++ b/editors/kate-plugins/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile index ed093e5aab62..c104a95189f9 100644 --- a/editors/kile-kde4/Makefile +++ b/editors/kile-kde4/Makefile @@ -21,7 +21,7 @@ CONFLICTS= kile-i18n-[0-9]* USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes OPTIONS= KPDF "Use KPDF and KDVI for viewing" on diff --git a/editors/kile/Makefile b/editors/kile/Makefile index ed093e5aab62..c104a95189f9 100644 --- a/editors/kile/Makefile +++ b/editors/kile/Makefile @@ -21,7 +21,7 @@ CONFLICTS= kile-i18n-[0-9]* USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes OPTIONS= KPDF "Use KPDF and KDVI for viewing" on diff --git a/editors/klat/Makefile b/editors/klat/Makefile index f5c519936144..e11d83b26dc7 100644 --- a/editors/klat/Makefile +++ b/editors/klat/Makefile @@ -17,7 +17,7 @@ COMMENT= A LaTeX source editor for KDE GNU_CONFIGURE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes .include <bsd.port.mk> diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile index 7e2301ffb752..d590f08d7f25 100644 --- a/editors/koffice-kde3/Makefile +++ b/editors/koffice-kde3/Makefile @@ -31,7 +31,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \ wv2.2:${PORTSDIR}/textproc/wv2 RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index 7e2301ffb752..d590f08d7f25 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -31,7 +31,7 @@ LIB_DEPENDS= GraphicsMagick++.1:${PORTSDIR}/graphics/GraphicsMagick \ wv2.2:${PORTSDIR}/textproc/wv2 RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile index b17459de40f8..46f69f18d716 100644 --- a/editors/kxmleditor/Makefile +++ b/editors/kxmleditor/Makefile @@ -16,7 +16,7 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= XML editor for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile index 86f97758b237..6d8f51ef74b8 100644 --- a/editors/lpe/Makefile +++ b/editors/lpe/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= slang.2:${PORTSDIR}/devel/libslang2 MAKE_JOBS_UNSAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile index b059d5c0d44b..8515db9401d5 100644 --- a/editors/mlview/Makefile +++ b/editors/mlview/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A tree oriented XML editor for Gnome USE_BZIP2= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_GNOME= eel2 gnomehack gnomeprefix gtksourceview USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile index 5f92239a2fe7..7fd439f9cadf 100644 --- a/editors/nvi-devel/Makefile +++ b/editors/nvi-devel/Makefile @@ -21,7 +21,7 @@ CONFLICTS= nvi-m17n-* USE_BZIP2= yes WRKSRC= ${WRKDIR}/${DISTNAME}/build.unix -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --with-db-prefix=${LOCALBASE} \ --program-prefix=n diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile index 861df7d2c18a..60d3ac667104 100644 --- a/editors/xmlcopyeditor/Makefile +++ b/editors/xmlcopyeditor/Makefile @@ -46,7 +46,7 @@ post-extract: # iconv.m4 is located in ${LOCALBASE}/share/aclocal ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal -USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoconf:262 automake:110 libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \ diff --git a/editors/xmleditor/Makefile b/editors/xmleditor/Makefile index 30e5dc493ba4..281076ab7da9 100644 --- a/editors/xmleditor/Makefile +++ b/editors/xmleditor/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BISON= build USE_GNOME= gnomehack libglade USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile index c9b4891931d3..3feb277c09b3 100644 --- a/emulators/bochs/Makefile +++ b/emulators/bochs/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-docbook diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile index 7efce1494770..efe3e839e3f2 100644 --- a/emulators/hercules/Makefile +++ b/emulators/hercules/Makefile @@ -7,7 +7,7 @@ PORTNAME= hercules PORTVERSION= 3.05 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://www.hercules-390.org/ @@ -18,10 +18,13 @@ OPTIONS= PTHREADS "Build with pthreads instead of fthreads." on \ NLS "Build with native language support." on \ DEBUG "Enable for debugging hercules itself." off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes +post-extract: + ${RM} ${WRKSRC}/ltdl.* + post-patch: @${REINPLACE_CMD} -e 's@-lpthread@${PTHREAD_LIBS}@g' ${WRKSRC}/configure .if defined(NOPORTDOCS) @@ -29,6 +32,8 @@ post-patch: .else @${REINPLACE_CMD} -e 's,^datadir = @datadir@,datadir = ${PREFIX}/share/doc/,' ${WRKSRC}/html/Makefile.in .endif + @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ + '/^libherc_la_LIBADD/s|=|= -lltdl |g' MAN1= cckddiag.1 dasdseq.1 MAN4= cckd.4 diff --git a/emulators/hercules/files/patch-libtool22 b/emulators/hercules/files/patch-libtool22 new file mode 100644 index 000000000000..273885ebc59c --- /dev/null +++ b/emulators/hercules/files/patch-libtool22 @@ -0,0 +1,75 @@ +--- Makefile.in.orig 2009-07-13 15:39:03.000000000 -0500 ++++ Makefile.in 2009-07-13 15:39:06.000000000 -0500 +@@ -257,13 +257,13 @@ + libhercu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) libhercs.la + am__libhercu_la_SOURCES_DIST = version.c hscutl.c hscutl2.c codepage.c \ + logger.c logmsg.c hdl.c hostinfo.c hsocket.c memrchr.c \ +- parser.c pttrace.c fthreads.c fishhang.c ltdl.c ++ parser.c pttrace.c fthreads.c fishhang.c + am__objects_5 = fthreads.lo + @BUILD_FTHREADS_TRUE@am__objects_8 = $(am__objects_5) + am__objects_6 = fishhang.lo + @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@am__objects_9 = \ + @BUILD_FISHHANG_TRUE@@BUILD_FTHREADS_TRUE@ $(am__objects_6) +-@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = ltdl.lo ++@OPTION_DYNAMIC_LOAD_TRUE@am__objects_10 = + am_libhercu_la_OBJECTS = version.lo hscutl.lo hscutl2.lo codepage.lo \ + logger.lo logmsg.lo hdl.lo hostinfo.lo hsocket.lo memrchr.lo \ + parser.lo pttrace.lo $(am__objects_8) $(am__objects_9) \ +@@ -626,7 +626,7 @@ + @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) + @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ltdl.c ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = + @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = + @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ + @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ +@@ -843,8 +843,7 @@ + memrchr.c \ + $(dynamic_SRC) \ + $(extra_SRC) \ +- $(dyndev_SRC) \ +- ltdl.c ++ $(dyndev_SRC) + + libherc_la_LDFLAGS = $(LIB_LD_FLAGS) + libherc_la_LIBADD = libhercs.la \ +@@ -1089,7 +1088,6 @@ + hdl.h \ + crypto.h \ + sockdev.h \ +- ltdl.h \ + herc_getopt.h \ + service.h \ + chsc.h \ +@@ -1465,7 +1463,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadparm.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logger.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logmsg.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ltdl.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machchk.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memrchr.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opcode.Plo@am__quote@ +--- crypto/Makefile.in.orig 2009-07-13 15:39:40.000000000 -0500 ++++ crypto/Makefile.in 2009-07-13 15:39:44.000000000 -0500 +@@ -244,7 +244,7 @@ + @OPTION_DYNAMIC_LOAD_FALSE@DYNSRC = $(dyndev_SRC) + @OPTION_DYNAMIC_LOAD_TRUE@DYNSRC = + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = + @OPTION_DYNAMIC_LOAD_FALSE@DYNMOD_LD_FLAGS = + @OPTION_DYNAMIC_LOAD_TRUE@DYNMOD_LD_FLAGS = -module \ + @OPTION_DYNAMIC_LOAD_TRUE@ -no-undefined \ +--- decNumber/Makefile.in.orig 2009-07-13 15:40:23.000000000 -0500 ++++ decNumber/Makefile.in 2009-07-13 15:40:25.000000000 -0500 +@@ -258,7 +258,7 @@ + @BUILD_SHARED_FALSE@XSTATIC = -static + @BUILD_SHARED_TRUE@XSTATIC = + @OPTION_DYNAMIC_LOAD_FALSE@LTDL = +-@OPTION_DYNAMIC_LOAD_TRUE@LTDL = ../ltdl.c ++@OPTION_DYNAMIC_LOAD_TRUE@LTDL = + @OPTION_DYNAMIC_LOAD_FALSE@LIB_LD_FLAGS = $(XSTATIC) \ + @OPTION_DYNAMIC_LOAD_FALSE@ -no-undefined \ + @OPTION_DYNAMIC_LOAD_FALSE@ -avoid-version diff --git a/emulators/lib765/Makefile b/emulators/lib765/Makefile index 0fa5df719851..e258782c22be 100644 --- a/emulators/lib765/Makefile +++ b/emulators/lib765/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.seasip.demon.co.uk/Unix/LibDsk/ MAINTAINER= ports@FreeBSD.org COMMENT= Emulation of uPD765a Floppy Disc Controller -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes OPTIONS= LIBDSK "With LIBDSK support (recommended)" on diff --git a/emulators/libdsk/Makefile b/emulators/libdsk/Makefile index 33df36c6908e..d8bdc887ba29 100644 --- a/emulators/libdsk/Makefile +++ b/emulators/libdsk/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.seasip.info/Unix/LibDsk/ \ MAINTAINER= pixel@hugbox.org COMMENT= Enables access to disks and disk images; also via serial line -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= apriboot.1 dskdump.1 dskform.1 dskid.1 dskscan.1 dsktrans.1\ diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index 17aab6247829..b16a206712e5 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -17,7 +17,7 @@ COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ jpeg.10:${PORTSDIR}/graphics/jpeg -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gtk12 diff --git a/finance/eqonomize-kde3/Makefile b/finance/eqonomize-kde3/Makefile index d1b5f8d39102..5940600d35f7 100644 --- a/finance/eqonomize-kde3/Makefile +++ b/finance/eqonomize-kde3/Makefile @@ -19,7 +19,7 @@ USE_GETTEXT= yes USE_KDELIBS_VER=3 GNU_CONFIGURE= yes USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes DATADIR= ${PREFIX}/share/apps/${PORTNAME} diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile index 2794c53b73ac..45c1fca9277d 100644 --- a/finance/gnofin/Makefile +++ b/finance/gnofin/Makefile @@ -18,7 +18,7 @@ COMMENT= Light-weight GNOME based financial management program USE_XORG= xpm sm USE_GNOME= gnomehack gnomelibs gnomeprefix USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/finance/kexchange/Makefile b/finance/kexchange/Makefile index ed9cde4b0e10..9700bcc66452 100644 --- a/finance/kexchange/Makefile +++ b/finance/kexchange/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE currency converter USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile index 2e7617b8f426..3361c483cea4 100644 --- a/finance/khacc/Makefile +++ b/finance/khacc/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_KDELIBS_VER=3 USE_PERL5_BUILD=yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22 CONFIGURE_ARGS= --with-qhacc-config=${LOCALBASE}/bin MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile index 1948ef89c706..5aade9a7658e 100644 --- a/finance/kmymoney-kde4/Makefile +++ b/finance/kmymoney-kde4/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS+= ofx.4:${PORTSDIR}/finance/libofx USE_KDELIBS_VER=3 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5= yes USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 1948ef89c706..5aade9a7658e 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS+= ofx.4:${PORTSDIR}/finance/libofx USE_KDELIBS_VER=3 USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5= yes USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile index 807179b46709..10a59bb80232 100644 --- a/finance/ktoblzcheck/Makefile +++ b/finance/ktoblzcheck/Makefile @@ -16,7 +16,7 @@ COMMENT= Check bank codes of German banks USE_GNOME= gnomehack gnometarget pkgconfig USE_PYTHON= 2.3+ USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= ktoblzcheck.1 diff --git a/finance/libofx/Makefile b/finance/libofx/Makefile index e58ef984577d..1404bdad6336 100644 --- a/finance/libofx/Makefile +++ b/finance/libofx/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl \ USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I m4 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-doxygen --disable-dot --disable-gengetopt \ diff --git a/finance/openhbci/Makefile b/finance/openhbci/Makefile index 23bf529d2cc1..313bc2ec5e65 100644 --- a/finance/openhbci/Makefile +++ b/finance/openhbci/Makefile @@ -14,7 +14,7 @@ DISTNAME= openhbci-0.9.17-2 MAINTAINER= ports@FreeBSD.org COMMENT= HBCI is a bank-independent homebanking standard -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.17 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index caeb09e3a70d..e095c1d7ece2 100644 --- a/finance/qhacc/Makefile +++ b/finance/qhacc/Makefile @@ -16,7 +16,7 @@ COMMENT= Simple QT-based financial manager RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/finance/quantlib/Makefile b/finance/quantlib/Makefile index d0f23f14401a..abce7e0c1683 100644 --- a/finance/quantlib/Makefile +++ b/finance/quantlib/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/QuantLib-${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/french/med/Makefile b/french/med/Makefile index 0d9a58953265..bb0da03f4334 100644 --- a/french/med/Makefile +++ b/french/med/Makefile @@ -37,7 +37,7 @@ CONFIGURE_ENV= HDF5HOME=${LOCALBASE} CPPFLAGS="${PTHREAD_CFLAGS}" \ CONFIGURE_ARGS= --with-f90=${FC} --docdir=${DOCSDIR} GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes DOC2FIX= . gif html jpg png tests diff --git a/french/verbiste/Makefile b/french/verbiste/Makefile index 1ba7f8d3922e..7b54ce86ecf1 100644 --- a/french/verbiste/Makefile +++ b/french/verbiste/Makefile @@ -18,7 +18,7 @@ OPTIONS= GNOMEGUI "With gnome gui" no USE_GETTEXT= yes USE_GNOME= gnomehack ltverhack libxml2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CPPFLAGS= -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile index fc90dccd0195..a72d85c54c40 100644 --- a/ftp/junglemonkey/Makefile +++ b/ftp/junglemonkey/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gnet.7:${PORTSDIR}/net/gnet USE_GNOME= gnomehack gnomeprefix libglade USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gnome=yes --enable-debug=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/ftp/kasablanca/Makefile b/ftp/kasablanca/Makefile index abe14fb3335b..f10bef8df084 100644 --- a/ftp/kasablanca/Makefile +++ b/ftp/kasablanca/Makefile @@ -19,7 +19,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_KDELIBS_VER=3 USE_GMAKE= yes USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile index dd9bb64ba5e0..7ffa93d9604f 100644 --- a/ftp/kbear/Makefile +++ b/ftp/kbear/Makefile @@ -24,7 +24,7 @@ USE_LDCONFIG= yes USE_KDELIBS_VER=3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE} LDFLAGS="${PTHREAD_LIBS}" post-patch: diff --git a/ftp/kftpgrabber/Makefile b/ftp/kftpgrabber/Makefile index 631e5f53ee28..c935fca447aa 100644 --- a/ftp/kftpgrabber/Makefile +++ b/ftp/kftpgrabber/Makefile @@ -17,7 +17,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/ftp/kpum/Makefile b/ftp/kpum/Makefile index 6f32de5e8826..8ef0b4c98f14 100644 --- a/ftp/kpum/Makefile +++ b/ftp/kpum/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/ftp/kwebget/Makefile b/ftp/kwebget/Makefile index 25a17a849b70..7567a7b1497b 100644 --- a/ftp/kwebget/Makefile +++ b/ftp/kwebget/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g ; \ diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile index 6b6d9ec3bfab..ccfe19d6e6cd 100644 --- a/ftp/urlgfe/Makefile +++ b/ftp/urlgfe/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl USE_GNOME= gtk20 lthack WANT_GNOME= yes USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" LDFLAGS+= -L${LOCALBASE}/lib diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile index d72a289aafbb..a36edc020952 100644 --- a/ftp/wzdftpd/Makefile +++ b/ftp/wzdftpd/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= novel@FreeBSD.org COMMENT= Modular FTP server configurable online using SITE commands -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_RC_SUBR= wzdftpd.sh USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/games/adgali/Makefile b/games/adgali/Makefile index b73c954584a1..8204e6b39cf6 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 \ execinfo.1:${PORTSDIR}/devel/libexecinfo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_SDL= sdl USE_XORG= xpm diff --git a/games/antrix/Makefile b/games/antrix/Makefile index c720045cbcce..99e1ce7c5677 100644 --- a/games/antrix/Makefile +++ b/games/antrix/Makefile @@ -17,7 +17,7 @@ COMMENT= Free stable dedicated-server for World of Warcraft BUILD_DEPENDS= svn:${PORTSDIR}/devel/subversion -USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:262 autoheader:262 automake:19 libtool:15 +USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:262 autoheader:262 automake:19 libtool:22 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a USE_MYSQL= yes diff --git a/games/apricots/Makefile b/games/apricots/Makefile index ae060660e5f8..303b51785425 100644 --- a/games/apricots/Makefile +++ b/games/apricots/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.fishies.org.uk/ \ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Fly a little plane around and shoot things and drop bombs -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_SDL= sdl diff --git a/games/atlantikdesigner/Makefile b/games/atlantikdesigner/Makefile index 6212e46ede62..35b40754fe11 100644 --- a/games/atlantikdesigner/Makefile +++ b/games/atlantikdesigner/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/games/brutalchess/Makefile b/games/brutalchess/Makefile index d00c24c8db81..b7f5ce8e6e8d 100644 --- a/games/brutalchess/Makefile +++ b/games/brutalchess/Makefile @@ -22,7 +22,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XORG= x11 xext xt xmu xi USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= yes USE_SDL= sdl image diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile index 5bf4ea8d32c6..fb112f82107f 100644 --- a/games/crossfire-server/Makefile +++ b/games/crossfire-server/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gnometarget USE_PERL5= yes USE_PYTHON= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-check=no diff --git a/games/duel/Makefile b/games/duel/Makefile index 63a8bf42f4c7..d482e3184e91 100644 --- a/games/duel/Makefile +++ b/games/duel/Makefile @@ -19,7 +19,7 @@ COMMENT= An overhead, OpenGL space shooter LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ ftgl.2:${PORTSDIR}/graphics/ftgl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GL= gl USE_SDL= sdl diff --git a/games/easysok/Makefile b/games/easysok/Makefile index c1a6b0bf6185..c49552a31364 100644 --- a/games/easysok/Makefile +++ b/games/easysok/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.pre.mk> diff --git a/games/exult/Makefile b/games/exult/Makefile index 5084d2f473e4..cbf4da1f7e23 100644 --- a/games/exult/Makefile +++ b/games/exult/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity USE_SDL= sdl mixer USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/games/ggz-client-libs/Makefile b/games/ggz-client-libs/Makefile index 372c123e2adf..26b3ba4ddc18 100644 --- a/games/ggz-client-libs/Makefile +++ b/games/ggz-client-libs/Makefile @@ -16,7 +16,7 @@ COMMENT= The GGZ Gaming Zone - Core Client Libraries LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile index fab9255628d3..b9263be3af64 100644 --- a/games/ggz-gtk-client/Makefile +++ b/games/ggz-gtk-client/Makefile @@ -14,7 +14,7 @@ CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= The GGZ Gaming Zone - GTK+ Frontend -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile index cea800bb7e73..8da4070782b9 100644 --- a/games/gnomememoryblocks/Makefile +++ b/games/gnomememoryblocks/Makefile @@ -18,7 +18,7 @@ COMMENT= Memory Blocks game for GNOME USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack gnomelibs gdkpixbuf -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/games/gnubg/Makefile b/games/gnubg/Makefile index b25d340d4345..a8248f6b7aa8 100644 --- a/games/gnubg/Makefile +++ b/games/gnubg/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ USE_GNOME= gnomehack gnometarget libxml2 USE_GMAKE= yes USE_PYTHON= 2.0+ -USE_AUTOTOOLS= libtool:15 automake:110 +USE_AUTOTOOLS= libtool:22 automake:110 GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 4260d4736497..96062958cbec 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -16,7 +16,7 @@ COMMENT= A simple turing machine simulator for GNOME 2 USE_GNOME= gnomeprefix gnomehack libgnomeui USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" INSTALLS_OMF= yes diff --git a/games/kamikaze/Makefile b/games/kamikaze/Makefile index 7b87c8d30695..f7c86e657877 100644 --- a/games/kamikaze/Makefile +++ b/games/kamikaze/Makefile @@ -15,7 +15,7 @@ COMMENT= Multiplayer bomberman-style game for KDE USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-server .include <bsd.port.mk> diff --git a/games/kbilliards/Makefile b/games/kbilliards/Makefile index 0ca76030afab..505eb0a07f9c 100644 --- a/games/kbilliards/Makefile +++ b/games/kbilliards/Makefile @@ -22,7 +22,7 @@ USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_PERL5_BUILD=yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CFLAGS+= -Dsqrtl=sqrt diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile index 6a9189d0d00e..245f84abf3d2 100644 --- a/games/kdegames3/Makefile +++ b/games/kdegames3/Makefile @@ -21,7 +21,7 @@ PREFIX= ${KDE_PREFIX} USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib diff --git a/games/kfreerings/Makefile b/games/kfreerings/Makefile index 3b8bade5b575..ae2b289cdf54 100644 --- a/games/kfreerings/Makefile +++ b/games/kfreerings/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= kdegames.3:${PORTSDIR}/games/kdegames3 USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: ${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure diff --git a/games/kmastermind/Makefile b/games/kmastermind/Makefile index c127a9b89f38..127c55905a5d 100644 --- a/games/kmastermind/Makefile +++ b/games/kmastermind/Makefile @@ -16,7 +16,7 @@ COMMENT= Mastermind game designed for K Desktop Environment BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11/kdelibs3:extract -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22 USE_PERL5_BUILD= yes USE_KDELIBS_VER= 3 USE_BZIP2= yes diff --git a/games/knights-kde4/Makefile b/games/knights-kde4/Makefile index 7ae41af5f0d4..449788421bb5 100644 --- a/games/knights-kde4/Makefile +++ b/games/knights-kde4/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE} post-patch: diff --git a/games/knights/Makefile b/games/knights/Makefile index 7ae41af5f0d4..449788421bb5 100644 --- a/games/knights/Makefile +++ b/games/knights/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= XML2POT=${TRUE} PO2XML=${TRUE} post-patch: diff --git a/games/kpicframer/Makefile b/games/kpicframer/Makefile index 27ce0272394b..839300156eae 100644 --- a/games/kpicframer/Makefile +++ b/games/kpicframer/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= kdegames.3:${PORTSDIR}/games/kdegames3 USE_BZIP2= yes USE_KDELIBS_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes pre-build: diff --git a/games/kpictorial/Makefile b/games/kpictorial/Makefile index 724252758892..4e9eef315b7b 100644 --- a/games/kpictorial/Makefile +++ b/games/kpictorial/Makefile @@ -15,7 +15,7 @@ MAINTAINER= arved@FreeBSD.org COMMENT= Little logical game for KDE USE_KDELIBS_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/games/kpuzzle/Makefile b/games/kpuzzle/Makefile index fa1684bbfd24..5ca28a1f144f 100644 --- a/games/kpuzzle/Makefile +++ b/games/kpuzzle/Makefile @@ -18,7 +18,7 @@ COMMENT= Jigsaw puzzle game for KDE WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_BZIP2= yes USE_KDELIBS_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: ${REINPLACE_CMD} -e "s,malloc.h,stdlib.h," \ diff --git a/games/krosswordplayer/Makefile b/games/krosswordplayer/Makefile index db3929c24189..6caa9f803f2b 100644 --- a/games/krosswordplayer/Makefile +++ b/games/krosswordplayer/Makefile @@ -15,6 +15,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE crossword puzzle game USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/games/kslide/Makefile b/games/kslide/Makefile index b6d0601e44bd..2140dc1f050a 100644 --- a/games/kslide/Makefile +++ b/games/kslide/Makefile @@ -16,7 +16,7 @@ COMMENT= KDE puzzle game USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes post-patch: diff --git a/games/ktritoc/Makefile b/games/ktritoc/Makefile index 12f2f1ac9396..b9ac1fb3c659 100644 --- a/games/ktritoc/Makefile +++ b/games/ktritoc/Makefile @@ -16,7 +16,7 @@ COMMENT= A Tic-tac-toe like boardgame LIB_DEPENDS= kdegames.3:${PORTSDIR}/games/kdegames3 USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: ${RM} -r ${WRKSRC}/ktritoc/doc/ktritoc/dtd diff --git a/games/kwappen/Makefile b/games/kwappen/Makefile index eb449cae1814..b86b24661b3b 100644 --- a/games/kwappen/Makefile +++ b/games/kwappen/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_GETTEXT= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes .include <bsd.port.mk> diff --git a/games/libfov/Makefile b/games/libfov/Makefile index a77736090670..46f3f4e73134 100644 --- a/games/libfov/Makefile +++ b/games/libfov/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= C library for calculating fields of view on low resolution rasters USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= ac_cv_prog_doxygen=no ac_cv_path_SDL_CONFIG=no USE_LDCONFIG= yes diff --git a/games/libggz/Makefile b/games/libggz/Makefile index 485de793311e..cc84e0488237 100644 --- a/games/libggz/Makefile +++ b/games/libggz/Makefile @@ -16,7 +16,7 @@ COMMENT= The GGZ Gaming Zone - Base Library LIB_DEPENDS= gcrypt.16:${PORTSDIR}/security/libgcrypt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/games/libggz/files/patch-libtool22 b/games/libggz/files/patch-libtool22 new file mode 100644 index 000000000000..a237a828b630 --- /dev/null +++ b/games/libggz/files/patch-libtool22 @@ -0,0 +1,24 @@ +--- configure.orig 2009-06-29 17:49:28.000000000 -0500 ++++ configure 2009-06-29 17:51:20.000000000 -0500 +@@ -22038,8 +22038,8 @@ + + + if test "$have_gnutls" = yes; then +- GGZTLS_INCLUDES="-I $gnutls_includes" +- GGZTLS_LDFLAGS="-L $gnutls_libraries" ++ GGZTLS_INCLUDES="-I$gnutls_includes" ++ GGZTLS_LDFLAGS="-L$gnutls_libraries" + LIB_GGZTLS=$gnutls_lib + { echo "$as_me:$LINENO: result: using GnuTLS" >&5 + echo "${ECHO_T}using GnuTLS" >&6; } +@@ -22295,8 +22295,8 @@ + + + if test "$have_ssl" = yes; then +- GGZTLS_INCLUDES="-I $ssl_includes" +- GGZTLS_LDFLAGS="-L $ssl_libraries" ++ GGZTLS_INCLUDES="-I$ssl_includes" ++ GGZTLS_LDFLAGS="-L$ssl_libraries" + LIB_GGZTLS=$ssl_lib + { echo "$as_me:$LINENO: result: using OpenSSL" >&5 + echo "${ECHO_T}using OpenSSL" >&6; } diff --git a/games/libmaitretarot/Makefile b/games/libmaitretarot/Makefile index 337991d818b6..46b363545be8 100644 --- a/games/libmaitretarot/Makefile +++ b/games/libmaitretarot/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= maitretarot MAINTAINER= thierry@FreeBSD.org COMMENT= Core library of MaitreTarot, a Tarot card game -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 libxml2 lthack diff --git a/games/libmt_client/Makefile b/games/libmt_client/Makefile index 04b821c8b5da..4b66f26c322a 100644 --- a/games/libmt_client/Makefile +++ b/games/libmt_client/Makefile @@ -17,7 +17,7 @@ COMMENT= Client-side library of MaitreTarot, a Tarot card game LIB_DEPENDS= maitretarot.0:${PORTSDIR}/games/libmaitretarot -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= glib20 libxml2 lthack diff --git a/games/mangos/Makefile b/games/mangos/Makefile index fe0c1af7c7c7..46c134b45a96 100644 --- a/games/mangos/Makefile +++ b/games/mangos/Makefile @@ -22,7 +22,7 @@ OPTIONS= SCRIPTDEV2 "ScriptDev2" on \ RA "Remote Administration support" off \ DBC "Install DBC files" on -USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:262 autoheader:262 automake:19 libtool:15 +USE_AUTOTOOLS= aclocal:19 libtoolize autoconf:262 autoheader:262 automake:19 libtool:22 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a USE_MYSQL= yes diff --git a/games/pinball/Makefile b/games/pinball/Makefile index 3f292b4be7ac..3137e041d802 100644 --- a/games/pinball/Makefile +++ b/games/pinball/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= alleg.42:${PORTSDIR}/devel/allegro USE_SDL= image mixer sdl USE_GMAKE= yes USE_GL= gl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --prefix=${PREFIX} --without-debug diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile index cbc1f3036571..ce0aa85b815f 100644 --- a/games/quake2forge/Makefile +++ b/games/quake2forge/Makefile @@ -15,7 +15,7 @@ DISTNAME= quake2-${PORTVERSION} MAINTAINER= alepulver@FreeBSD.org COMMENT= First Person Shooter with many addons available -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_BZIP2= yes CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/${PORTNAME}/' \ diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile index 7ec6521d7239..caac5c32043e 100644 --- a/games/quakeforge/Makefile +++ b/games/quakeforge/Makefile @@ -20,7 +20,7 @@ COMMENT= Cleaned up copy of the GPLd Quake 1 source code NOT_FOR_ARCHS= sparc64 NOT_FOR_ARCHS_REASON= generated Quake C compiler (qfcc) does not work -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_BISON= build USE_GMAKE= yes diff --git a/games/sdlCC/Makefile b/games/sdlCC/Makefile index fbc5727faf74..9f29cbabef78 100644 --- a/games/sdlCC/Makefile +++ b/games/sdlCC/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://chinesecheckers.vegard2.no/ \ MAINTAINER= frank@dynamical-systems.org COMMENT= An extensible chinese checkers game using SDL -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= image mixer sdl GNU_CONFIGURE= yes diff --git a/games/six/Makefile b/games/six/Makefile index 2f7c23c19e16..4fa419401efc 100644 --- a/games/six/Makefile +++ b/games/six/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE HEX clone USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/games/taxipilot/Makefile b/games/taxipilot/Makefile index 660e6a81a0ba..41ae427ddb43 100644 --- a/games/taxipilot/Makefile +++ b/games/taxipilot/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= artsmodules.0:${PORTSDIR}/multimedia/kdemultimedia3 USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure CONFIGURE_ENV= LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS}" diff --git a/games/teg/Makefile b/games/teg/Makefile index 452d1bde67c9..f514fdad323d 100644 --- a/games/teg/Makefile +++ b/games/teg/Makefile @@ -16,7 +16,7 @@ COMMENT= A turn-based strategy game for GNOME USE_GNOME= gnomehack gnomeprefix gnometarget intlhack libgnomeui USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-ggz diff --git a/games/thevalley/Makefile b/games/thevalley/Makefile index 203174e94162..b87fc8c2d82b 100644 --- a/games/thevalley/Makefile +++ b/games/thevalley/Makefile @@ -14,7 +14,7 @@ DISTNAME= valley-${PORTVERSION} MAINTAINER= edwin@mavetju.org COMMENT= The Valley is a rewrite of an old RPG from the early 1980s -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 HAS_CONFIGURE= yes WRKSRC= ${WRKDIR}/${DISTNAME} USE_SDL= sdl diff --git a/games/vamos/Makefile b/games/vamos/Makefile index f7bd717ac07c..5ce3a7e4e0aa 100644 --- a/games/vamos/Makefile +++ b/games/vamos/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= alut.1:${PORTSDIR}/audio/freealut \ USE_GL= glut USE_SDL= sdl USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= ac_cv_header_boost_test_unit_test_hpp=no \ ac_cv_lib_freeglut_glutGetModifiers=no diff --git a/german/kheisereg/Makefile b/german/kheisereg/Makefile index 3e46a06c1450..f4cc29a23426 100644 --- a/german/kheisereg/Makefile +++ b/german/kheisereg/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure USE_BZIP2= yes USE_KDEBASE_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/german/ksteak/Makefile b/german/ksteak/Makefile index 18519db9b00a..a77ad4a0d31f 100644 --- a/german/ksteak/Makefile +++ b/german/ksteak/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= steak:${PORTSDIR}/german/steak USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 85c01c3ee858..97c6568586d2 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -31,7 +31,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ TESTS "Run bundled self-tests after build" on USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index 24f8de983526..c778df6d5b43 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -7,7 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ @@ -22,7 +22,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ jbig:${PORTSDIR}/graphics/jbigkit \ wmflite:${PORTSDIR}/graphics/libwmf \ xml2:${PORTSDIR}/textproc/libxml2 \ - ltdl:${PORTSDIR}/devel/libltdl15 + ltdl:${PORTSDIR}/devel/libltdl22 OTHERGRAPHICS= jasper jpeg lcms png tiff LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|} OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ @@ -33,7 +33,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ TESTS "Run bundled self-tests after build" on USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 7be2d907e126..dfdb94499be1 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -7,7 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ @@ -22,7 +22,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ jbig:${PORTSDIR}/graphics/jbigkit \ wmflite:${PORTSDIR}/graphics/libwmf \ xml2:${PORTSDIR}/textproc/libxml2 \ - ltdl:${PORTSDIR}/devel/libltdl15 + ltdl:${PORTSDIR}/devel/libltdl22 OTHERGRAPHICS= jasper jpeg lcms png tiff LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|} @@ -34,7 +34,7 @@ OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \ TESTS "Run bundled self-tests after build" on USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GHOSTSCRIPT=yes GNU_CONFIGURE= yes diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile index 6ad9cccc43e0..b60fb1d6ab7f 100644 --- a/graphics/Hermes/Makefile +++ b/graphics/Hermes/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= ports@FreeBSD.org COMMENT= Fast pixel formats conversion library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 1f24b385f64e..d52e89d12566 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -7,7 +7,7 @@ PORTNAME= ImageMagick DISTVERSION= 6.5.3-10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics perl5 MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ \ ${MASTER_SITE_SOURCEFORGE} \ @@ -23,9 +23,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} USE_BZIP2= yes USE_PERL5= yes USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 # For some reason, using our libtool breaks the build into pieces: -#USE_AUTOTOOLS+= libtool:15 +#USE_AUTOTOOLS+= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-shared --without-dps diff --git a/graphics/OpenEXR/Makefile b/graphics/OpenEXR/Makefile index bff602522d00..afabe399501b 100644 --- a/graphics/OpenEXR/Makefile +++ b/graphics/OpenEXR/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase USE_GMAKE= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= YES CONFIGURE_ARGS+=--enable-imfexamples diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile index af1eb53c417e..50433a5c2d02 100644 --- a/graphics/aalib/Makefile +++ b/graphics/aalib/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= ports@FreeBSD.org COMMENT= An ascii art library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index eabedf710850..6bf10edb06e9 100644 --- a/graphics/agg/Makefile +++ b/graphics/agg/Makefile @@ -24,7 +24,7 @@ USE_GNOME= pkgconfig gnomehack USE_GMAKE= yes USE_LDCONFIG= yes ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal -USE_AUTOTOOLS= autoconf:262:env automake:15:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:15:env libtool:22:env MAKE_ENV= C="${CC}" AGGCXXFLAGS="${CXXFLAGS}" CXXFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I../include -L./ diff --git a/graphics/ampasCTL/Makefile b/graphics/ampasCTL/Makefile index 61e1aed72143..623aebf302d4 100644 --- a/graphics/ampasCTL/Makefile +++ b/graphics/ampasCTL/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= Half.6:${PORTSDIR}/graphics/ilmbase USE_GNOME= pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile index 17ff11e45c49..6041eb48eda5 100644 --- a/graphics/autotrace/Makefile +++ b/graphics/autotrace/Makefile @@ -17,7 +17,7 @@ COMMENT= Convert bitmap to vector graphics LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ MagickWand.2:${PORTSDIR}/graphics/ImageMagick -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \ diff --git a/graphics/bmp-rootvis/Makefile b/graphics/bmp-rootvis/Makefile index b1d901d14512..0839bde4dd94 100644 --- a/graphics/bmp-rootvis/Makefile +++ b/graphics/bmp-rootvis/Makefile @@ -23,6 +23,6 @@ PLIST_FILES= lib/bmp/Visualization/librootvis.so \ USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile index 63e612b08cc1..b1033341648e 100644 --- a/graphics/bugle/Makefile +++ b/graphics/bugle/Makefile @@ -7,6 +7,7 @@ PORTNAME= bugle PORTVERSION= 0.0.20071009 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -21,7 +22,7 @@ GNU_CONFIGURE= yes USE_GCC= 3.4 USE_GL= gl USE_PERL5= yes -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/${PORTNAME} CONFIGURE_ARGS=--enable-ltdl-install=no diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 93ad202b079e..5141460de1bd 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --with-html-dir=${DOCSDIR} \ --enable-pdf \ --enable-ps USE_GNOME= gnomehack ltverhack referencehack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index 57e8394a1192..52d7aad8d3db 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ interface to cairo LIB_DEPENDS= xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ cairo.2:${PORTSDIR}/graphics/cairo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget ltverhack diff --git a/graphics/cal3d-devel/Makefile b/graphics/cal3d-devel/Makefile index c50a143284c9..eec67abf2c47 100644 --- a/graphics/cal3d-devel/Makefile +++ b/graphics/cal3d-devel/Makefile @@ -22,7 +22,7 @@ CONFLICTS= cal3d-[0-9]* USE_BZIP2= yes USE_GNOME= pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:19 autoheader:262 libtool:15 +USE_AUTOTOOLS= automake:19 autoheader:262 libtool:22 AUTOMAKE_ARGS= --add-missing MAN1= cal3d_converter.1 diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile index 8aab087d4d02..bb9b7647023f 100644 --- a/graphics/cal3d/Makefile +++ b/graphics/cal3d/Makefile @@ -19,7 +19,7 @@ CONFLICTS= cal3d-devel-[0-9]* USE_GNOME= pkgconfig GNU_CONFIGURE= yes -USE_AUTOTOOLS= automake:19 autoheader:262 libtool:15 +USE_AUTOTOOLS= automake:19 autoheader:262 libtool:22 USE_LDCONFIG= yes MAN1= cal3d_converter.1 diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 67cd2b2645da..768423b4a595 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ftgl.2:${PORTSDIR}/graphics/ftgl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_PYTHON= yes USE_GNOME= gtk12 diff --git a/graphics/clutter-box2d/Makefile b/graphics/clutter-box2d/Makefile index 750ca7bdc7f8..62e6422bb1d5 100644 --- a/graphics/clutter-box2d/Makefile +++ b/graphics/clutter-box2d/Makefile @@ -17,7 +17,7 @@ COMMENT= Clutter Box2D integration library LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack ltverhack gnomeprefix USE_XORG= xp x11 USE_LDCONFIG= yes diff --git a/graphics/clutter-cairo/Makefile b/graphics/clutter-cairo/Makefile index 9b3c4cdecf6d..4cf5a64233d9 100644 --- a/graphics/clutter-cairo/Makefile +++ b/graphics/clutter-cairo/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \ cairo.2:${PORTSDIR}/graphics/cairo USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack ltverhack USE_XORG= xp x11 USE_LDCONFIG= yes diff --git a/graphics/clutter-gtk/Makefile b/graphics/clutter-gtk/Makefile index 529bf2897cbc..b0e1642410dd 100644 --- a/graphics/clutter-gtk/Makefile +++ b/graphics/clutter-gtk/Makefile @@ -17,7 +17,7 @@ COMMENT= GTK+ Integration library for Clutter LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gtk20 ltverhack gnomeprefix USE_XORG= xp x11 USE_LDCONFIG= yes diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile index 0c80dece4f4e..deed407bf6ad 100644 --- a/graphics/clutter/Makefile +++ b/graphics/clutter/Makefile @@ -17,7 +17,7 @@ COMMENT= OpenGL based interactive canvas library LIB_DEPENDS= json-glib-1.0:${PORTSDIR}/devel/json-glib USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gtk20 gnomehack ltverhack gnomeprefix USE_GL= gl USE_XORG= glproto x11 xfixes xdamage xcomposite xi diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index 1c6eba7e1c34..aafe38970697 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index 90a29ae1d956..bfd063c8f9f8 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -29,7 +29,7 @@ OPTIONS= JPEG "Enable JPEG support" on \ WRKSRC= ${WRKDIR}/${DISTNAME:L} USE_GNOME= pkgconfig -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I m4 -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing --copy --force-missing CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/graphics/diacanvas2/Makefile b/graphics/diacanvas2/Makefile index a332fa82aa8c..4efd082af426 100644 --- a/graphics/diacanvas2/Makefile +++ b/graphics/diacanvas2/Makefile @@ -18,7 +18,7 @@ COMMENT= A general drawing canvas from dia dialog editor USE_GNOME= gnomehack gnometarget pygnome2 USE_PYTHON= 2.2+ USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 547d669bb1a4..421d7a747a42 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ jasper.4:${PORTSDIR}/graphics/jasper USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index 3dcb9ab31dcb..ff8eef7fd746 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -31,7 +31,7 @@ USE_XORG= ice x11 xext xv USE_GNOME= esound USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ ac_cv_header_mpeg_h=no \ ac_cv_header_libmpeg3_h=no \ diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile index 45609652ec73..03519936a894 100644 --- a/graphics/esmart/Makefile +++ b/graphics/esmart/Makefile @@ -7,7 +7,7 @@ PORTNAME= esmart PORTVERSION= 0.9.0.042 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index a51513261067..889245f59e5d 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \ USE_LDCONFIG= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_GMAKE= yes diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index 19ba91a0293a..8aeb983c20b4 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF/enlightenment MAINTAINER= ports@FreeBSD.org COMMENT= Fonts and font libraries necessary for Enlightenment -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= imlib GNU_CONFIGURE= yes diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 51ea938d5333..1c365ec3997e 100644 --- a/graphics/freeglut/Makefile +++ b/graphics/freeglut/Makefile @@ -16,7 +16,7 @@ COMMENT= An alternative to the OpenGL Utility Toolkit (GLUT) library CONFLICTS= libglut-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_XORG= ice diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index a9597a6917a7..51000201036d 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \ MAINTAINER= sunpoet@sunpoet.net COMMENT= A translator library for geospatial data formats -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index 4a4c670979c0..75f4f49a9b22 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -22,7 +22,7 @@ OPTIONS= MOTION_AVG "Use experimental motion averaging code" off USE_BZIP2= yes USE_MOTIF= yes USE_GL= glu -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-motif=${LOCALBASE} --with-opengl=${LOCALBASE} USE_LDCONFIG= yes diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile index 146017692c2a..7bab9994592a 100644 --- a/graphics/geos/Makefile +++ b/graphics/geos/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= konstantin@saurbier.net COMMENT= GEOS implements all the OpenGIS "Simple Features for SQL" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= YES USE_BZIP2= YES diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile index 9a9d709b2dab..8ec46a13d381 100644 --- a/graphics/gephex/Makefile +++ b/graphics/gephex/Makefile @@ -30,7 +30,7 @@ USE_QT_VER= 4 QT_COMPONENTS= corelib gui moc_build uic_build USE_XORG= xv USE_GMAKE= yes -USE_AUTOTOOLS= automake:18 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:18 autoconf:262 libtool:22 AUTOMAKE_ARGS= --foreign CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-ASOUNDLIB --without-AVIFILE \ diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile index 0bb1bcdd61b1..66eebdf84df6 100644 --- a/graphics/giblib/Makefile +++ b/graphics/giblib/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://linuxbrit.co.uk/downloads/ MAINTAINER= ports@FreeBSD.org COMMENT= A utility library that includes a wrapper for imlib2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig USE_EFL= imlib2 GNU_CONFIGURE= yes diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile index 1377ef2e703e..3773e9780075 100644 --- a/graphics/giflib/Makefile +++ b/graphics/giflib/Makefile @@ -16,7 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Tools and library routines for working with GIF images USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 43fe5d40b191..c595c409719f 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -43,7 +43,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_XORG= xpm xmu xext USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME+= gnomehack intltool intlhack gtk20 libartlgpl2 ltverhack \ desktopfileutils USE_LDCONFIG= yes diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile index 9b1737b45e89..c1065de3f051 100644 --- a/graphics/giram/Makefile +++ b/graphics/giram/Makefile @@ -21,7 +21,7 @@ USE_GETTEXT= yes USE_PERL5_BUILD=yes USE_GNOME= gtk20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/graphics/gle/Makefile b/graphics/gle/Makefile index cc2f7cb366e7..66460abe09b8 100644 --- a/graphics/gle/Makefile +++ b/graphics/gle/Makefile @@ -19,7 +19,7 @@ MAINTAINER= ports@dclg.ca COMMENT= A GL Tubing and Extrusion Library USE_GL= glut -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= "LIBS=-L${LOCALBASE}/lib -lXext ${PTHREAD_LIBS}" diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile index 46fc88e0a69b..8d847b92ed72 100644 --- a/graphics/glide3/Makefile +++ b/graphics/glide3/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 xxf86dga xxf86vm USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:14 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:14 autoconf:262 libtool:22 AUTOMAKE_ARGS= -a MAKEFILE= makefile.autoconf diff --git a/graphics/gltt/Makefile b/graphics/gltt/Makefile index 8ed8347696f7..7ff231ae5f38 100644 --- a/graphics/gltt/Makefile +++ b/graphics/gltt/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://gltt.sourceforge.net/download/ MAINTAINER= ports@FreeBSD.org COMMENT= TrueType fonts rendering using OpenGL -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= gl glut USE_FREETYPE= yes USE_GMAKE= yes diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index ed9f8e9c6004..be91b90533a2 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 20081208 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics # gnashdev.org is slower MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ \ @@ -38,7 +38,7 @@ USE_GCC= 4.2+ # triggers compiler error on gcc 3.4 WANT_GSTREAMER= yes USE_GNOME= pkgconfig libxml2 USE_XORG= x11 xau xdmcp xext xi xinerama ice sm -USE_AUTOTOOLS= libltdl:15 libtool:15:env +USE_AUTOTOOLS= libltdl:22 libtool:22:env MAKE_JOBS_SAFE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 8891665f1166..33499f68a1b0 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.8.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics # getgnash.org is slow MASTER_SITES= ${MASTER_SITE_GNU} \ @@ -34,7 +34,7 @@ USE_GCC= 4.2+ # triggers compiler error on gcc 3.4 WANT_GSTREAMER= yes USE_GNOME= pkgconfig libxml2 USE_XORG= x11 xau xdmcp xext xi xinerama ice sm -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 MAKE_JOBS_SAFE= yes CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ diff --git a/graphics/goocanvas/Makefile b/graphics/goocanvas/Makefile index b6ffebced565..6a540ac4853f 100644 --- a/graphics/goocanvas/Makefile +++ b/graphics/goocanvas/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ahze@FreeBSD.org COMMENT= Canvas widget for GTK+ USE_GNOME= gtk20 gnomehack ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_BZIP2= yes diff --git a/graphics/goocanvasmm/Makefile b/graphics/goocanvasmm/Makefile index a30d23b3dbb2..61196b972832 100644 --- a/graphics/goocanvasmm/Makefile +++ b/graphics/goocanvasmm/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ goocanvas.3:${PORTSDIR}/graphics/goocanvas USE_GNOME= gnomehack ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/goom/Makefile b/graphics/goom/Makefile index 99657bb77dcb..927e2828cd93 100644 --- a/graphics/goom/Makefile +++ b/graphics/goom/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S|.|-|}-src MAINTAINER= ports@FreeBSD.org COMMENT= Visual effects library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S|.|-|} USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 63fbdd6a8d2b..9117c5a44c8a 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -7,6 +7,7 @@ PORTNAME= graphviz PORTVERSION= 2.24.0 +PORTREVISION= 1 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -22,7 +23,7 @@ LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ USE_BISON= build USE_GMAKE= yes -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 WANT_GNOME= yes GNU_CONFIGURE= yes LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/gsnapshot/Makefile b/graphics/gsnapshot/Makefile index 5a3c9b6e322b..6d0e9fa5af58 100644 --- a/graphics/gsnapshot/Makefile +++ b/graphics/gsnapshot/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= gould MAINTAINER= ports@FreeBSD.org COMMENT= A gtk+ based screen capture -USE_AUTOTOOLS= automake:15:env libtool:15 +USE_AUTOTOOLS= automake:15:env libtool:22 USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_XORG= x11 diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile index a8fb109d9505..dc28715f40ac 100644 --- a/graphics/gtkdps/Makefile +++ b/graphics/gtkdps/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS+= dpstk.0:${PORTSDIR}/x11/dgs USE_GNOME= gtk12 GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-dps-includes=${LOCALBASE}/include \ --with-dps-libraries=${LOCALBASE}/lib diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile index 3029dab728e4..dcce55d3cc1b 100644 --- a/graphics/gwenview-kde4/Makefile +++ b/graphics/gwenview-kde4/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--enable-kipi diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile index 3029dab728e4..dcce55d3cc1b 100644 --- a/graphics/gwenview/Makefile +++ b/graphics/gwenview/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--enable-kipi diff --git a/graphics/ilmbase/Makefile b/graphics/ilmbase/Makefile index c5843f2b0a22..90afd8d21105 100644 --- a/graphics/ilmbase/Makefile +++ b/graphics/ilmbase/Makefile @@ -22,7 +22,7 @@ OPTIONS= THREAD "Enable multithreaded file I/O support" on USE_GNOME= pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 regression test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 5307dfb27f42..67bbe3ad6c84 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_XORG= sm xext x11 USE_GMAKE= yes diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile index 650b7528d8f2..f44a97a603e7 100644 --- a/graphics/iulib/Makefile +++ b/graphics/iulib/Makefile @@ -24,8 +24,9 @@ OPTIONS= SDL "Enable SDL for graphical debugging" off \ MAKE_JOBS_SAFE= yes USE_PYTHON_BUILD= yes -USE_AUTOTOOLS= libtool:15 aclocal:110 automake:110 autoconf:262 +USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:262 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal +AUTOMAKE_ARGS= --add-missing USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index 0400edd8900b..ef8e7497dc86 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -18,7 +18,7 @@ COMMENT= An implementation of the codec specified in the JPEG-2000 standard LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ZIP= yes USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 748980dbcbee..e0cc3f0420d7 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -23,7 +23,7 @@ COMMENT= IJG's jpeg compression utilities WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/graphics/kalbum/Makefile b/graphics/kalbum/Makefile index bd01d2d42559..7deff0cc3b2c 100644 --- a/graphics/kalbum/Makefile +++ b/graphics/kalbum/Makefile @@ -16,7 +16,7 @@ COMMENT= Create albums from a collection of images USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ diff --git a/graphics/kallery/Makefile b/graphics/kallery/Makefile index 86b0fe81889b..28d7b4395081 100644 --- a/graphics/kallery/Makefile +++ b/graphics/kallery/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= MagickCore.2:${PORTSDIR}/graphics/ImageMagick USE_KDELIBS_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes INSTALLS_ICONS= yes diff --git a/graphics/kamera-kde4/Makefile b/graphics/kamera-kde4/Makefile index a646334103e8..e47cfae2d011 100644 --- a/graphics/kamera-kde4/Makefile +++ b/graphics/kamera-kde4/Makefile @@ -26,7 +26,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} diff --git a/graphics/kamera/Makefile b/graphics/kamera/Makefile index a646334103e8..e47cfae2d011 100644 --- a/graphics/kamera/Makefile +++ b/graphics/kamera/Makefile @@ -26,7 +26,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile index 5d0065cc55bf..9b7a5798144b 100644 --- a/graphics/kbarcode/Makefile +++ b/graphics/kbarcode/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_KDELIBS_VER= 3 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env GNU_CONFIGURE= yes INSTALLS_ICONS= yes diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile index 901f14d26023..bdabc0bc3a86 100644 --- a/graphics/kdegraphics3/Makefile +++ b/graphics/kdegraphics3/Makefile @@ -33,7 +33,7 @@ PREFIX= ${KDE_PREFIX} USE_GL= glut USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WANT_GNOME= yes USE_GHOSTSCRIPT=yes diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile index e9c8dfa10569..5e4f7ecc94fa 100644 --- a/graphics/kipi-plugins/Makefile +++ b/graphics/kipi-plugins/Makefile @@ -44,7 +44,7 @@ OPTIONS= ACQUIREIMAGES "scanner/screenshot plugin" on \ WALLPAPER "set your image as wallpaper" on USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes diff --git a/graphics/kooka/Makefile b/graphics/kooka/Makefile index 8d9cf07acd81..9f1b2f609de3 100644 --- a/graphics/kooka/Makefile +++ b/graphics/kooka/Makefile @@ -27,7 +27,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} USE_LDCONFIG= yes diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index 7bf1889ed644..71439887eec6 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index 7bf1889ed644..71439887eec6 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= kipi.2:${PORTSDIR}/graphics/libkipi \ USE_KDELIBS_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/graphics/kradview/Makefile b/graphics/kradview/Makefile index b72aa1b77642..16ff102f3a4d 100644 --- a/graphics/kradview/Makefile +++ b/graphics/kradview/Makefile @@ -16,6 +16,6 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A free DICOM viewer for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile index b67a91007a18..4bc30badf3d1 100644 --- a/graphics/kuickshow-kde4/Makefile +++ b/graphics/kuickshow-kde4/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} USE_LDCONFIG= yes diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile index b67a91007a18..4bc30badf3d1 100644 --- a/graphics/kuickshow/Makefile +++ b/graphics/kuickshow/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdegraphics-${PORTVERSION} USE_LDCONFIG= yes diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 5d2382e80976..ddc70b38d4e6 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ PROJECTHOST= leptonica MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 aclocal:110 automake:110 autoconf:262 +USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:262 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib diff --git a/graphics/leptonlib/Makefile b/graphics/leptonlib/Makefile index 5d2382e80976..ddc70b38d4e6 100644 --- a/graphics/leptonlib/Makefile +++ b/graphics/leptonlib/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ PROJECTHOST= leptonica MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 aclocal:110 automake:110 autoconf:262 +USE_AUTOTOOLS= libtool:22 aclocal:110 automake:110 autoconf:262 ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I${LOCALBASE}/share/aclocal USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib diff --git a/graphics/libart/Makefile b/graphics/libart/Makefile index acb0194a1f43..e2cbfa70ec0f 100644 --- a/graphics/libart/Makefile +++ b/graphics/libart/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://tiger.bioinf.cs.uni-potsdam.de/free/Graphics/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Library for high-performance 2D graphics -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}_lgpl-${PORTVERSION} GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index 0a66800708bc..19ae0ed447c7 100644 --- a/graphics/libart_lgpl/Makefile +++ b/graphics/libart_lgpl/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Library for high-performance 2D graphics -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget pkgconfig diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile index 8b1ad1acb75b..81f01d7c38ed 100644 --- a/graphics/libcaca/Makefile +++ b/graphics/libcaca/Makefile @@ -16,7 +16,7 @@ COMMENT= Graphics library that outputs text instead of pixels USE_GNOME= gnomehack gnometarget ltverhack pkgconfig USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-doc \ --enable-ncurses \ --disable-csharp \ diff --git a/graphics/libemf/Makefile b/graphics/libemf/Makefile index e07cb0cb83b8..5853621deb39 100644 --- a/graphics/libemf/Makefile +++ b/graphics/libemf/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/libemf/g} MAINTAINER= maho@FreeBSD.org COMMENT= Enhanced Metafile Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile index 8a4e592b5967..f03a4a35a81e 100644 --- a/graphics/libexif-gtk/Makefile +++ b/graphics/libexif-gtk/Makefile @@ -18,7 +18,7 @@ COMMENT= GTK+ widgets to display/edit EXIF tags LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif USE_GNOME= gnomehack gnometarget gtk20 -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile index c1bc531dd9da..769773c5c4f5 100644 --- a/graphics/libexif/Makefile +++ b/graphics/libexif/Makefile @@ -16,7 +16,7 @@ COMMENT= Library to read digital camera file meta-data USE_BZIP2= yes USE_GNOME= gnomehack ltverhack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --disable-docs diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile index e3f3801e9128..acfe14dd9795 100644 --- a/graphics/libflash/Makefile +++ b/graphics/libflash/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ USE_XORG= x11 xext xkbfile xt WRKSRC= ${WRKDIR}/${DISTNAME}/lib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/libgltext/Makefile b/graphics/libgltext/Makefile index 5496b1d4c452..2989fa99d7fa 100644 --- a/graphics/libgltext/Makefile +++ b/graphics/libgltext/Makefile @@ -17,7 +17,7 @@ COMMENT= Portable font rendering library for C++ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= glu USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile index 68789323a284..db4e0d9f720b 100644 --- a/graphics/libgnomecanvas/Makefile +++ b/graphics/libgnomecanvas/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack libglade2 libartlgpl2 ltverhack referencehack CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile index 665f346a9257..cd6b1690a754 100644 --- a/graphics/libgnomecanvasmm/Makefile +++ b/graphics/libgnomecanvasmm/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes USE_GNOME= gnomehack libgnomecanvas -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index 834c214e16e1..49c3f2b264da 100644 --- a/graphics/libgphoto2/Makefile +++ b/graphics/libgphoto2/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgphoto2 PORTVERSION= 2.4.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -19,7 +20,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif USE_BZIP2= yes USE_GNOME= gnometarget pkgconfig ltverhack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 LIBTOOLFILES= configure libgphoto2_port/configure USE_LDCONFIG= yes CONFIGURE_ENV= LTDLINCL="-I${LOCALBASE}/include" LIBLTDL="-L${LOCALBASE}/lib -lltdl" diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile index 17bbd008e4a7..4be366be1701 100644 --- a/graphics/libiptcdata/Makefile +++ b/graphics/libiptcdata/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pav@FreeBSD.org COMMENT= Library for manipulating IPTC metadata stored in image files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig USE_ICONV= yes USE_LDCONFIG= yes diff --git a/graphics/libkdcraw-kde4/Makefile b/graphics/libkdcraw-kde4/Makefile index 4436e7a31c6d..d4a4e6192873 100644 --- a/graphics/libkdcraw-kde4/Makefile +++ b/graphics/libkdcraw-kde4/Makefile @@ -21,7 +21,7 @@ USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index 4436e7a31c6d..d4a4e6192873 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -21,7 +21,7 @@ USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile index 3bdb1fdd6aa3..f1152b87e471 100644 --- a/graphics/libkexif/Makefile +++ b/graphics/libkexif/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GETTEXT= yes diff --git a/graphics/libkexiv2-kde4/Makefile b/graphics/libkexiv2-kde4/Makefile index bdd93f530c8d..673e401d2dc9 100644 --- a/graphics/libkexiv2-kde4/Makefile +++ b/graphics/libkexiv2-kde4/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index bdd93f530c8d..673e401d2dc9 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/graphics/libkipi-kde4/Makefile b/graphics/libkipi-kde4/Makefile index f71ed1b12a16..f30cb1f8f511 100644 --- a/graphics/libkipi-kde4/Makefile +++ b/graphics/libkipi-kde4/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile index f71ed1b12a16..f30cb1f8f511 100644 --- a/graphics/libkipi/Makefile +++ b/graphics/libkipi/Makefile @@ -18,7 +18,7 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile index 94f76f6411c8..95c90f9a028d 100644 --- a/graphics/libmorph/Makefile +++ b/graphics/libmorph/Makefile @@ -16,7 +16,7 @@ COMMENT= A library for loading (and saving) 3d modeller object files CONFLICTS= xmorph* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index bbafd8aa36ba..c2b21f219215 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ USE_GNOME= gtk20 glib20 pango atk USE_AUTOTOOLS= autoconf:262:env autoheader:262:env aclocal:19:env \ - automake:19:env libtool:15:env + automake:19:env libtool:22:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ diff --git a/graphics/libpano12/files/patch-bootstrap b/graphics/libpano12/files/patch-bootstrap index 36d8cf94cb10..81b9fc2a5d26 100644 --- a/graphics/libpano12/files/patch-bootstrap +++ b/graphics/libpano12/files/patch-bootstrap @@ -1,5 +1,14 @@ ---- bootstrap.orig 2006-09-07 21:19:28.000000000 +0300 -+++ bootstrap 2007-10-05 19:29:22.000000000 +0300 +--- bootstrap.orig 2006-09-07 13:19:28.000000000 -0500 ++++ bootstrap 2009-07-13 19:56:34.000000000 -0500 +@@ -23,7 +23,7 @@ + libtool_version=`$LIBTOOLIZE --version | sed 's/.*) \([0-9.][0-9.]*\).*/\1/'` + # echo libtool version: $libtool_version + case $libtool_version in +- 1.4*|1.5*) ++ 1.4*|1.5*|2.2*) + have_libtool=true + ;; + esac @@ -60,7 +60,7 @@ automake_version=`$AUTOMAKE --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'` # echo automake version: $automake_version diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 30c7d693717f..7d018db815e3 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ USE_GNOME= gtk20 glib20 pango atk USE_AUTOTOOLS= autoconf:262:env autoheader:262:env aclocal:110:env \ - automake:110:env libtool:15:env + automake:110:env libtool:22:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/gtk-2.0 \ -I${LOCALBASE}/include/glib-2.0 \ diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile index f35b3797d48a..f64adee21539 100644 --- a/graphics/librsvg/Makefile +++ b/graphics/librsvg/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ popt.0:${PORTSDIR}/devel/popt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomelibs gdkpixbuf USE_LDCONFIG= yes diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile index 062982a1c318..1c077631fedb 100644 --- a/graphics/librsvg2/Makefile +++ b/graphics/librsvg2/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= gtk-engines2>=2.7.5_1:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnomeprefix libgsf gtk20 ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile index cc95851b5691..e3e86090f9fb 100644 --- a/graphics/libsvg-cairo/Makefile +++ b/graphics/libsvg-cairo/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ svg.1:${PORTSDIR}/graphics/libsvg \ cairo.2:${PORTSDIR}/graphics/cairo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= pkgconfig gnometarget gnomehack USE_LDCONFIG= yes diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile index bd7496f3244d..4814e5080eac 100644 --- a/graphics/libsvg/Makefile +++ b/graphics/libsvg/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ png.5:${PORTSDIR}/graphics/png \ jpeg.10:${PORTSDIR}/graphics/jpeg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= libxml2 gnomehack gnometarget USE_ICONV= yes diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile index 4671cefd6ef8..65b0599efdd5 100644 --- a/graphics/libungif/Makefile +++ b/graphics/libungif/Makefile @@ -17,7 +17,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= Tools and library routines for working with GIF images USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile index 86831cb426cf..836e8444eb96 100644 --- a/graphics/libvisual/Makefile +++ b/graphics/libvisual/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Abstraction library that sits between apps and visual plugin USE_GNOME= gnomehack pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile index e46a3bfd1c70..32838c2a70d9 100644 --- a/graphics/libvisual04/Makefile +++ b/graphics/libvisual04/Makefile @@ -15,7 +15,7 @@ PKGNAMESUFFIX= 04 MAINTAINER= ports@FreeBSD.org COMMENT= Abstraction library that sits between apps and visual plugin -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack pkgconfig USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 6fcbf48e7d5f..84eef02da910 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget libxml2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sys-gd=no \ diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile index 11fe7cbc6fcf..907808c4a00c 100644 --- a/graphics/libwpg/Makefile +++ b/graphics/libwpg/Makefile @@ -15,7 +15,7 @@ COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics ima LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack ltverhack USE_PERL5= yes USE_LDCONFIG= yes diff --git a/graphics/libwpg01/Makefile b/graphics/libwpg01/Makefile index 11fe7cbc6fcf..907808c4a00c 100644 --- a/graphics/libwpg01/Makefile +++ b/graphics/libwpg01/Makefile @@ -15,7 +15,7 @@ COMMENT= Library for importing and converting Corel WordPerfect(tm) Graphics ima LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack ltverhack USE_PERL5= yes USE_LDCONFIG= yes diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index e7410314516e..e576035cc686 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -7,7 +7,7 @@ PORTNAME= mapnik PORTVERSION= 0.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography MASTER_SITES= ${MASTER_SITE_BERLIOS}/${PORTNAME}/ @@ -16,7 +16,7 @@ COMMENT= A Free Toolkit For Developing Mapping Applications LIB_DEPENDS= geos:${PORTSDIR}/graphics/geos \ proj:${PORTSDIR}/graphics/proj \ - ltdl:${PORTSDIR}/devel/libltdl15 \ + ltdl:${PORTSDIR}/devel/libltdl22 \ png:${PORTSDIR}/graphics/png \ tiff:${PORTSDIR}/graphics/tiff \ cairo.2:${PORTSDIR}/graphics/cairo \ diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile index bab5dd78c550..9e1a9238a199 100644 --- a/graphics/nurbs++/Makefile +++ b/graphics/nurbs++/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libnurbs MAINTAINER= gahr@FreeBSD.org COMMENT= A C++ library for representing curves or surfaces -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --program-transform-name="s/x/x/" USE_LDCONFIG= yes diff --git a/graphics/ogre3d/Makefile b/graphics/ogre3d/Makefile index b50fc05cf1f4..d850a151d55f 100644 --- a/graphics/ogre3d/Makefile +++ b/graphics/ogre3d/Makefile @@ -30,7 +30,7 @@ OPTIONS= GTK "Use GTK instead of Xt gui" off \ DEMOS "Build OGRE demos" off GNU_CONFIGURE= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= YES USE_BZIP2= YES USE_GNOME= gnomehack diff --git a/graphics/ogre3d/pkg-plist b/graphics/ogre3d/pkg-plist index 686969e9b3ac..ca5a71ce0b21 100644 --- a/graphics/ogre3d/pkg-plist +++ b/graphics/ogre3d/pkg-plist @@ -236,29 +236,22 @@ include/OGRE/OgreViewport.h include/OGRE/OgreWireBoundingBox.h include/OGRE/OgreZip.h include/OGRE/asm_math.h -lib/OGRE/Plugin_BSPSceneManager.a lib/OGRE/Plugin_BSPSceneManager.la lib/OGRE/Plugin_BSPSceneManager.so -lib/OGRE/Plugin_OctreeSceneManager.a lib/OGRE/Plugin_OctreeSceneManager.la lib/OGRE/Plugin_OctreeSceneManager.so -lib/OGRE/Plugin_OctreeZone.a lib/OGRE/Plugin_OctreeZone.la lib/OGRE/Plugin_OctreeZone.so -lib/OGRE/Plugin_ParticleFX.a lib/OGRE/Plugin_ParticleFX.la lib/OGRE/Plugin_ParticleFX.so -lib/OGRE/RenderSystem_GL.a lib/OGRE/RenderSystem_GL.la lib/OGRE/RenderSystem_GL.so -lib/OGRE/libPlugin_PCZSceneManager.a lib/OGRE/libPlugin_PCZSceneManager.la lib/OGRE/libPlugin_PCZSceneManager.so lib/libCEGUIOgreRenderer.a lib/libCEGUIOgreRenderer.la lib/libCEGUIOgreRenderer.so lib/libCEGUIOgreRenderer-1.6.2.so -lib/libOgreMain.a lib/libOgreMain.la lib/libOgreMain.so lib/libOgreMain-1.6.2.so diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 041a4d67caec..88304c203a2c 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_ CFLAGS+= -I${LOCALBASE}/include/OpenEXR CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/OpenEXR LDFLAGS+= -L${LOCALBASE}/lib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile index eb275c7cdca9..13602206e1a7 100644 --- a/graphics/opendx/Makefile +++ b/graphics/opendx/Makefile @@ -24,7 +24,7 @@ USE_XORG= xinerama xext xpm xmu sm ice USE_BISON= build USE_GL= yes USE_MOTIF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ENV= ARCH="${OPSYS:L}" \ CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ diff --git a/graphics/openexr_ctl/Makefile b/graphics/openexr_ctl/Makefile index 2da9b25f98aa..dd65a3bb3071 100644 --- a/graphics/openexr_ctl/Makefile +++ b/graphics/openexr_ctl/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS+= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ USE_GNOME= pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 test check: build @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index cf8d35ff3a88..43250e43bc96 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ tiff:${PORTSDIR}/graphics/tiff \ ungif:${PORTSDIR}/graphics/libungif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-SDL --disable-dfb diff --git a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index a24c8f1bbc76..072358ae37a9 100644 --- a/graphics/pfstools/Makefile +++ b/graphics/pfstools/Makefile @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --disable-jpeghdr --disable-matlab \ CONFIGURE_ENV= CPPFLAGS="${PFS_CPPFLAGS}" \ LDFLAGS="${PFS_LDFLAGS}" \ PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes USE_GNOME= pkgconfig diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index b35de5cf91e7..ddc832937901 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -27,7 +27,7 @@ WRKSRC= ${WRKDIR}/Pixie USE_GNOME= gnomehack USE_GL= glu USE_BISON= build -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --includedir=${PREFIX}/include/pixie \ --libdir=${PREFIX}/lib/pixie \ diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile index 1e819c779085..436e9beb3a31 100644 --- a/graphics/pixieplus/Makefile +++ b/graphics/pixieplus/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick \ BROKEN= does not compile -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER=3 USE_LDCONFIG= yes USE_BZIP2= yes diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile index f683531e7a86..79a5b4e3eb51 100644 --- a/graphics/plotutils/Makefile +++ b/graphics/plotutils/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png USE_GNOME= gnometarget USE_MOTIF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-libplotter --enable-libxmi --with-motif USE_LDCONFIG= yes diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 36519ac4492a..1655ecbd0e8a 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libxml2 ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ diff --git a/graphics/potracegui/Makefile b/graphics/potracegui/Makefile index 0251370a3838..c816e28be690 100644 --- a/graphics/potracegui/Makefile +++ b/graphics/potracegui/Makefile @@ -20,7 +20,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 OPTIONS= POTRACE "potrace backend" on \ AUTOTRACE "Autotrace backend" on diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index c5484c34faf8..2a7edae5e099 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -23,7 +23,7 @@ OPTIONS= IMAGEMAGICK "Enable magick++ interface" on \ USE_GNOME= gnomehack gnometarget pkgconfig USE_GHOSTSCRIPT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/graphics/py-clutter/Makefile b/graphics/py-clutter/Makefile index 245ea5840a24..cd825b085989 100644 --- a/graphics/py-clutter/Makefile +++ b/graphics/py-clutter/Makefile @@ -28,7 +28,7 @@ LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter \ clutter-gtk-0.8:${PORTSDIR}/graphics/clutter-gtk USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack pygnome2 pygtk2 USE_GSTREAMER= yes USE_PYTHON= 2.4+ diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile index 5a607d689f22..cb9a89584b71 100644 --- a/graphics/qglviewer/Makefile +++ b/graphics/qglviewer/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.gris.uni-tuebingen.de/grisalt/projects/qglviewer/ MAINTAINER= ports@FreeBSD.org COMMENT= Use OpenGL to play around with three dimensional scenes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_QT_VER= 3 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/quesa/Makefile b/graphics/quesa/Makefile index 4aa68d227aab..e2e8850ffc5e 100644 --- a/graphics/quesa/Makefile +++ b/graphics/quesa/Makefile @@ -18,7 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= ports@FreeBSD.org COMMENT= High level 3D graphics library compatible with Apple's QuickDraw(TM) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= glut USE_XORG= x11 ice xmu xi .ifdef (WITH_EXAMPLES) diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile index 56798adbec8f..d14b45dcdbd2 100644 --- a/graphics/sane-epkowa/Makefile +++ b/graphics/sane-epkowa/Makefile @@ -43,7 +43,7 @@ PORTNAME= epkowa PORTVERSION= 2.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://lx1.avasys.jp/iscan/${PORTVERSION}/ DISTNAME= iscan_${PORTVERSION}-1 @@ -60,12 +60,12 @@ WRKSRC=${WRKDIR}/iscan-${PORTVERSION} MAN5= sane-epkowa.5 # We use LIB_DEPENDS, but the dependency is also at build time -LIB_DEPENDS+= ltdl:${PORTSDIR}/devel/libltdl15 +LIB_DEPENDS+= ltdl:${PORTSDIR}/devel/libltdl22 LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb LIB_DEPENDS+= getline:${PORTSDIR}/devel/libgetline LIB_DEPENDS+= sane.1:${PORTSDIR}/graphics/sane-backends -#BUILD_DEPENDS+= ${LOCALBASE}/lib/libltdl.so:${PORTSDIR}/devel/libltdl15 +#BUILD_DEPENDS+= ${LOCALBASE}/lib/libltdl.so:${PORTSDIR}/devel/libltdl22 # gtk libraries are used by the frontend, which we do not build, however # the configure script relies on that and fails if not present, so as diff --git a/graphics/sdl_gfx/Makefile b/graphics/sdl_gfx/Makefile index 04ed4d8572ea..b120933605ca 100644 --- a/graphics/sdl_gfx/Makefile +++ b/graphics/sdl_gfx/Makefile @@ -17,7 +17,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= SDL graphics drawing primitives and other support functions MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index 386923defd40..aace772d5860 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile index 1abf4a55235a..2e5fba3607c8 100644 --- a/graphics/sdl_ttf/Makefile +++ b/graphics/sdl_ttf/Makefile @@ -16,7 +16,7 @@ COMMENT= A library to use TrueType fonts to render text in SDL applications LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile index dcdfa049be4c..8a92fd0f7e03 100644 --- a/graphics/showimg/Makefile +++ b/graphics/showimg/Makefile @@ -20,7 +20,7 @@ COMMENT= A picture viewer designed to run under KDE 3.x USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-pgsql diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index cd6c33088413..1689908dcc71 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-mpeg2enc diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile index 25e977b85156..aaf4926b6ffc 100644 --- a/graphics/sodipodi/Makefile +++ b/graphics/sodipodi/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libglade2 libartlgpl2 desktopfileutils USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --without-gnome-print \ --with-popt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2" \ diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile index 8652e83a6fa7..2c99d64d16f5 100644 --- a/graphics/sswf/Makefile +++ b/graphics/sswf/Makefile @@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GNOME= pkgconfig USE_BISON= build USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig USE_LDCONFIG= yes diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile index c5c952f5d067..6151e11798a4 100644 --- a/graphics/swfdec/Makefile +++ b/graphics/swfdec/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= oil-0.3.0:${PORTSDIR}/devel/liboil \ USE_LDCONFIG= yes USE_GNOME= gnomehack gtk20 ltverhack USE_GSTREAMER= core good mp3 ffmpeg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib" diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile index 722faaa586d9..b52bbe198cd2 100644 --- a/graphics/swfmill/Makefile +++ b/graphics/swfmill/Makefile @@ -16,7 +16,7 @@ COMMENT= xml2swf and swf2xml processor with import functionalities LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig libxml2 libxslt GNU_CONFIGURE= YES diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 5796401d6b14..f8514ada5799 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -20,7 +20,7 @@ COMMENT= Tools and library routines for working with TIFF images LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \ --with-jpeg-lib-dir=${LOCALBASE}/lib diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index a19c50fc3121..8995c6b1ab30 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -29,7 +29,7 @@ QT_COMPONENTS= corelib moc_build uic_build rcc_build gui opengl xml network \ USE_GL= glut USE_GMAKE= yes USE_GNOME= libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes PORTDOCS= userManual.pdf diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 3dc6c80bf3b7..c8fcd23577d7 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -19,7 +19,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= vd@FreeBSD.org COMMENT= VIGRA stands for "Vision with Generic Algorithms" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --docdir=${DOCSDIR} USE_GMAKE= yes diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 90310dac386f..0edc75a5cc19 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -34,7 +34,7 @@ PYPRESENT!= which python > /dev/null && echo on || echo off USE_GMAKE= yes USE_PERL5_BUILD= yes USE_GNOME= gnomehack glib20 pkgconfig pango libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes ALL_TARGET= -j`${SYSCTL} -n hw.ncpu` diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile index d50618ba2496..3adee9db4347 100644 --- a/graphics/wxsvg/Makefile +++ b/graphics/wxsvg/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ library to create, manipulate, and render SVG files AUTOMAKE_ARGS= --add-missing USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 automake:15 autoconf:262 +USE_AUTOTOOLS= libtool:22 automake:15 autoconf:262 USE_GNOME= libartlgpl2 USE_GMAKE= yes USE_WX= 2.6 diff --git a/graphics/xaralx/Makefile b/graphics/xaralx/Makefile index ba225e61d959..9b58d7d9fad0 100644 --- a/graphics/xaralx/Makefile +++ b/graphics/xaralx/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS+= pkg-config:${PORTSDIR}/devel/pkg-config \ RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick LIB_DEPENDS+= xml2.5:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= autoconf:262:env aclocal:19:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env aclocal:19:env automake:19:env libtool:22:env GNU_CONFIGURE= yes CONFIGURE_ARGS+= --program-suffix=${PKGNAMESUFFIX} diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index bd801db4881e..17d735312f4e 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -30,7 +30,7 @@ OPTIONS= X11 "With X11" on \ WANT_GNOME= yes USE_GNOME= gnometarget USE_SUBMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --includedir=${PREFIX}/include/xmedcon \ diff --git a/graphics/xmms-goom/Makefile b/graphics/xmms-goom/Makefile index e52694f2f2d5..b5c0aac2a34d 100644 --- a/graphics/xmms-goom/Makefile +++ b/graphics/xmms-goom/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms \ nasm:${PORTSDIR}/devel/nasm RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_XORG= x11 USE_GNOME+= gdkpixbuf gnomehack pkgconfig GNU_CONFIGURE= yes diff --git a/graphics/xmorph/Makefile b/graphics/xmorph/Makefile index 3c21661ab65a..b3dc8c9eb81b 100644 --- a/graphics/xmorph/Makefile +++ b/graphics/xmorph/Makefile @@ -24,7 +24,7 @@ CONFLICTS= libmorph* WANT_GNOME= yes USE_GNOME= gnometarget USE_XORG= xbitmaps x11 xaw xext -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-waili diff --git a/irc/bopm/Makefile b/irc/bopm/Makefile index 3e03e426006e..a5347d5a5b66 100644 --- a/irc/bopm/Makefile +++ b/irc/bopm/Makefile @@ -16,7 +16,7 @@ COMMENT= Open proxy and DNSBL monitor, designed for use with ircds LOGDIR= /var/log/${PORTNAME} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure src/libopm/configure CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc --localstatedir=${LOGDIR} diff --git a/irc/kmyirc/Makefile b/irc/kmyirc/Makefile index d5ae97138bc7..8d495abd3d04 100644 --- a/irc/kmyirc/Makefile +++ b/irc/kmyirc/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Easy to use IRC client for KDE -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER= 3 USE_GMAKE= yes diff --git a/irc/konversation/Makefile b/irc/konversation/Makefile index 2de0436695d7..df183773e949 100644 --- a/irc/konversation/Makefile +++ b/irc/konversation/Makefile @@ -16,7 +16,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= A user friendly IRC client for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes diff --git a/irc/kvirc-devel/Makefile b/irc/kvirc-devel/Makefile index 9106eb2f9388..d63f4b9a4454 100644 --- a/irc/kvirc-devel/Makefile +++ b/irc/kvirc-devel/Makefile @@ -15,7 +15,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= chris@officialunix.com COMMENT= IRC client for QT and KDE -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile index 63762bb26c15..9f947d1dfb77 100644 --- a/irc/kvirc/Makefile +++ b/irc/kvirc/Makefile @@ -18,7 +18,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}/source MAINTAINER= chris@officialunix.com COMMENT= IRC client for QT and KDE -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes diff --git a/irc/kwirc/Makefile b/irc/kwirc/Makefile index 605c63bcfd68..dc158c67f8f0 100644 --- a/irc/kwirc/Makefile +++ b/irc/kwirc/Makefile @@ -16,7 +16,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= IRC client for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile index 5c6dc2931230..6182d8dc3706 100644 --- a/japanese/FreeWnn-lib/Makefile +++ b/japanese/FreeWnn-lib/Makefile @@ -21,7 +21,7 @@ COMMENT?= A Japanese/Chinese/Korean input method (Japanese client libraries) USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes MAKE_ARGS= MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" ALL_TARGET= includes all diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h index 9733e291b9b1..6999dc97c311 100644 --- a/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h +++ b/japanese/FreeWnn-lib/files/patch-Wnn-include-wnn_os.h @@ -3,7 +3,7 @@ Index: Wnn/include/wnn_os.h RCS file: /home/cvs/private/hrs/freewnn/Wnn/include/wnn_os.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- Wnn/include/wnn_os.h 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ Wnn/include/wnn_os.h 2 Jan 2009 21:09:34 -0000 1.2 @@ -154,4 +154,5 @@ diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc index 0809bf3d2e41..734d3da3bb0e 100644 --- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc +++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-jserverrc @@ -3,7 +3,7 @@ Index: Wnn/jd/jserverrc RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/jserverrc,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3 --- Wnn/jd/jserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ Wnn/jd/jserverrc 2 Jan 2009 21:56:36 -0000 1.3 @@ -29,6 +29,9 @@ diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs index 6b49f3da5934..0ec577e0e87c 100644 --- a/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs +++ b/japanese/FreeWnn-lib/files/patch-Wnn-jd-serverdefs @@ -3,7 +3,7 @@ Index: Wnn/jd/serverdefs RCS file: /home/cvs/private/hrs/freewnn/Wnn/jd/serverdefs,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- Wnn/jd/serverdefs 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ Wnn/jd/serverdefs 20 Dec 2008 07:23:09 -0000 1.2 @@ -30,12 +30,12 @@ diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in index 25ad913d023f..392a5a2b8cbd 100644 --- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-Makefile.in @@ -3,7 +3,7 @@ Index: Wnn/jlib/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- Wnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ Wnn/jlib/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2 @@ -62,13 +62,15 @@ diff --git a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c index a0f5ed020b69..681038ceaeeb 100644 --- a/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c +++ b/japanese/FreeWnn-lib/files/patch-Wnn-jlib-js.c @@ -3,7 +3,7 @@ Index: Wnn/jlib/js.c RCS file: /home/cvs/private/hrs/freewnn/Wnn/jlib/js.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- Wnn/jlib/js.c 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ Wnn/jlib/js.c 2 Jan 2009 21:55:55 -0000 1.2 @@ -132,9 +132,7 @@ diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc index fced54c3f816..513c78b506fe 100644 --- a/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc +++ b/japanese/FreeWnn-lib/files/patch-cWnn-cd-cserverrc @@ -3,7 +3,7 @@ Index: cWnn/cd/cserverrc RCS file: /home/cvs/private/hrs/freewnn/cWnn/cd/cserverrc,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3 --- cWnn/cd/cserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ cWnn/cd/cserverrc 2 Jan 2009 21:56:38 -0000 1.3 @@ -39,6 +39,9 @@ diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in index 297aaad704c6..c4942f151712 100644 --- a/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-cWnn-etc-Makefile.in @@ -3,7 +3,7 @@ Index: cWnn/etc/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/cWnn/etc/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- cWnn/etc/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ cWnn/etc/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2 @@ -36,11 +36,13 @@ diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in index 01079f8eb675..ca9990ae3be2 100644 --- a/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-cWnn-include-Makefile.in @@ -3,7 +3,7 @@ Index: cWnn/include/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/cWnn/include/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- cWnn/include/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ cWnn/include/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2 @@ -36,7 +36,8 @@ diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in index 8766e5298939..6b1d61c1db7f 100644 --- a/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-cWnn-jlib-Makefile.in @@ -3,7 +3,7 @@ Index: cWnn/jlib/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/cWnn/jlib/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- cWnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ cWnn/jlib/Makefile.in 2 Jan 2009 21:09:34 -0000 1.2 @@ -57,6 +57,8 @@ diff --git a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc index ac30de98e904..014f33976a0b 100644 --- a/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc +++ b/japanese/FreeWnn-lib/files/patch-cWnn-td-tserverrc @@ -3,7 +3,7 @@ Index: cWnn/td/tserverrc RCS file: /home/cvs/private/hrs/freewnn/cWnn/td/tserverrc,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- cWnn/td/tserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ cWnn/td/tserverrc 20 Dec 2008 07:23:12 -0000 1.2 @@ -35,6 +35,8 @@ diff --git a/japanese/FreeWnn-lib/files/patch-config.h.in b/japanese/FreeWnn-lib/files/patch-config.h.in index b19822271d21..2d6dc4a5fc4d 100644 --- a/japanese/FreeWnn-lib/files/patch-config.h.in +++ b/japanese/FreeWnn-lib/files/patch-config.h.in @@ -3,7 +3,7 @@ Index: config.h.in RCS file: /home/cvs/private/hrs/freewnn/config.h.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- config.h.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ config.h.in 2 Jan 2009 21:09:32 -0000 1.2 @@ -33,12 +33,24 @@ diff --git a/japanese/FreeWnn-lib/files/patch-configure b/japanese/FreeWnn-lib/files/patch-configure index e31ad18cad1f..9d68110df03e 100644 --- a/japanese/FreeWnn-lib/files/patch-configure +++ b/japanese/FreeWnn-lib/files/patch-configure @@ -3,7 +3,7 @@ Index: configure RCS file: /home/cvs/private/hrs/freewnn/configure,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- configure 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ configure 2 Jan 2009 21:09:32 -0000 1.2 @@ -1,11 +1,575 @@ diff --git a/japanese/FreeWnn-lib/files/patch-configure.in b/japanese/FreeWnn-lib/files/patch-configure.in index 4e638f43f653..a42d80adb85f 100644 --- a/japanese/FreeWnn-lib/files/patch-configure.in +++ b/japanese/FreeWnn-lib/files/patch-configure.in @@ -3,7 +3,7 @@ Index: configure.in RCS file: /home/cvs/private/hrs/freewnn/configure.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- configure.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ configure.in 2 Jan 2009 21:09:32 -0000 1.2 @@ -422,6 +422,16 @@ diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in index ee79864db67a..5b11ec95acd8 100644 --- a/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-kWnn-etc-Makefile.in @@ -3,7 +3,7 @@ Index: kWnn/etc/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/kWnn/etc/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- kWnn/etc/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ kWnn/etc/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2 @@ -35,10 +35,12 @@ diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in index 1196d53016f9..249c5a9f3fd9 100644 --- a/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-kWnn-include-Makefile.in @@ -3,7 +3,7 @@ Index: kWnn/include/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/kWnn/include/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- kWnn/include/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ kWnn/include/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2 @@ -36,7 +36,8 @@ diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in index 03c349d7bd94..6307c79abb96 100644 --- a/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in +++ b/japanese/FreeWnn-lib/files/patch-kWnn-jlib-Makefile.in @@ -3,7 +3,7 @@ Index: kWnn/jlib/Makefile.in RCS file: /home/cvs/private/hrs/freewnn/kWnn/jlib/Makefile.in,v retrieving revision 1.1.1.1 retrieving revision 1.2 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.2 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.2 --- kWnn/jlib/Makefile.in 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ kWnn/jlib/Makefile.in 2 Jan 2009 21:09:35 -0000 1.2 @@ -61,13 +61,15 @@ diff --git a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc index e2ba41e7bed9..9849fdf099e8 100644 --- a/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc +++ b/japanese/FreeWnn-lib/files/patch-kWnn-kd-kserverrc @@ -3,7 +3,7 @@ Index: kWnn/kd/kserverrc RCS file: /home/cvs/private/hrs/freewnn/kWnn/kd/kserverrc,v retrieving revision 1.1.1.1 retrieving revision 1.3 -diff -d -u -I\$FreeBSD$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$Translation:.*\$ -I\$hrs:.*\$ -w -r1.1.1.1 -r1.3 +diff -d -u -I\$FreeBSD$ -w -r1.1.1.1 -r1.3 --- kWnn/kd/kserverrc 20 Dec 2008 07:13:30 -0000 1.1.1.1 +++ kWnn/kd/kserverrc 2 Jan 2009 21:56:38 -0000 1.3 @@ -29,6 +29,9 @@ diff --git a/japanese/FreeWnn-lib/files/patch-libtool22 b/japanese/FreeWnn-lib/files/patch-libtool22 new file mode 100644 index 000000000000..dd599aa14b20 --- /dev/null +++ b/japanese/FreeWnn-lib/files/patch-libtool22 @@ -0,0 +1,76 @@ +--- Wnn/romkan/Makefile.in.orig 2009-07-12 22:17:42.000000000 -0500 ++++ Wnn/romkan/Makefile.in 2009-07-12 22:18:01.000000000 -0500 +@@ -46,7 +46,7 @@ + + .c.o: + $(RM) $@ +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $< + + clean:: + $(RM) -r .libs +--- Wnn/jlib.V3/Makefile.in.orig 2009-07-12 22:19:13.000000000 -0500 ++++ Wnn/jlib.V3/Makefile.in 2009-07-12 22:21:06.000000000 -0500 +@@ -71,12 +71,12 @@ + + .c.o: + $(RM) $@ +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $*.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $*.c + + all:: libjd.la + + libjd.la: $(OBJS) $(EXTRALIBRARYDEPS) +- $(LIBTOOL) $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) ++ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS:.o=.lo) -rpath $(WNNLIBDIR) -version-info $(WNNJLIBVERSION) + + lintlib:: llib-ljd.ln + +@@ -87,7 +87,7 @@ + install:: libjd.la + @if [ -d $(DESTDIR)$(WNNLIBDIR) ]; then set +x; \ + else (set -x; $(MKDIRHIER) $(DESTDIR)$(WNNLIBDIR)); fi +- $(LIBTOOL) $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR) ++ $(LIBTOOL) --mode=install $(INSTALL) $(INSTLIBFLAGS) libjd.la $(DESTDIR)$(WNNLIBDIR) + + install:: jlib.h + @if [ -d $(DESTDIR)$(JWNNINCDIR) ]; then set +x; \ +@@ -109,13 +109,13 @@ + done + + $(OBJ2) : $(SRC2) +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ3) : $(SRC3) +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + $(OBJ4) : $(SRC4) +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(WNNETCSRC)/`basename $@ .o`.c + + depend:: .depend + +--- kWnn/romkan/Makefile.in.orig 2009-07-12 22:26:37.000000000 -0500 ++++ kWnn/romkan/Makefile.in 2009-07-12 22:26:55.000000000 -0500 +@@ -48,7 +48,7 @@ + + .c.o: + $(RM) $@ +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $< + + clean:: + $(RM) -r .libs +--- cWnn/romkan/Makefile.in.orig 2009-07-12 22:29:35.000000000 -0500 ++++ cWnn/romkan/Makefile.in 2009-07-12 22:29:49.000000000 -0500 +@@ -48,7 +48,7 @@ + + .c.o: + $(RM) $@ +- $(LIBTOOL) $(CC) -c $(CFLAGS) $(_NOOP_) $< ++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(_NOOP_) $< + + clean:: + $(RM) -r .libs diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile index e4a4e1ff4b84..67bf18e2aace 100644 --- a/japanese/FreeWnn-server/Makefile +++ b/japanese/FreeWnn-server/Makefile @@ -21,7 +21,7 @@ COMMENT?= A Japanese/Chinese/Korean input method (Japanese server) USE_BZIP2= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes USE_RC_SUBR= # defined below MAKE_ARGS= MANLANG="${MANLANG}" CDEBUGFLAGS="${CFLAGS}" diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile index 502bcf12de0c..b8a921b1be8b 100644 --- a/japanese/chasen-base/Makefile +++ b/japanese/chasen-base/Makefile @@ -18,7 +18,7 @@ COMMENT= Japanese Morphological Analysis System BUILD_DEPENDS= ${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE} USE_ICONV= yes diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile index f0639e1ba421..8ad05c6a4d48 100644 --- a/japanese/eb/Makefile +++ b/japanese/eb/Makefile @@ -52,7 +52,7 @@ APPENDIXFILES= appendix/cencro-1.0.tar.gz \ DIST_SUBDIR= eb -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GETTEXT= yes USE_PERL5= yes diff --git a/japanese/iiimf-le-canna/Makefile b/japanese/iiimf-le-canna/Makefile index 192647aecdf2..622e25ae8ce0 100644 --- a/japanese/iiimf-le-canna/Makefile +++ b/japanese/iiimf-le-canna/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes USE_GNOME= gtk20 -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/japanese/iiimf-le-freewnn/Makefile b/japanese/iiimf-le-freewnn/Makefile index e18d9c2a5c1a..586e0e71698a 100644 --- a/japanese/iiimf-le-freewnn/Makefile +++ b/japanese/iiimf-le-freewnn/Makefile @@ -26,7 +26,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/japanese/jd/Makefile b/japanese/jd/Makefile index e671728b7cbc..48147c551ae1 100644 --- a/japanese/jd/Makefile +++ b/japanese/jd/Makefile @@ -19,7 +19,7 @@ COMMENT= A 2ch browser MAKE_JOBS_SAFE= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= autoconf:262 automake:110 libtool:22 LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls \ gtkmm:${PORTSDIR}/x11-toolkits/gtkmm24 diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile index 25813b0bb7fc..fa8f4c7fb530 100644 --- a/japanese/kakasi/Makefile +++ b/japanese/kakasi/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://kakasi.namazu.org/stable/ MAINTAINER= ota@j.email.ne.jp COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes MANLANG= ja diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile index d1bca9c31818..75cf2d9c2f4d 100644 --- a/japanese/libicq/Makefile +++ b/japanese/libicq/Makefile @@ -23,7 +23,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library to add ICQ communication support to your software USE_GNOME= glib12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile index 6c7329c18ec4..137a465388c3 100644 --- a/japanese/mecab/Makefile +++ b/japanese/mecab/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF MAINTAINER= clsung@FreeBSD.org COMMENT= Yet Another Part-of-Speech and Morphological Analyzer -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_PERL5_BUILD= 5.8.0+ GNU_CONFIGURE= yes 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 diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile index f055cb12cbc8..ba1abe8897fa 100644 --- a/japanese/scim-canna/Makefile +++ b/japanese/scim-canna/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim LIB_DEPENDS+= canna.1:${PORTSDIR}/japanese/canna-lib RUN_DEPENDS= ${BUILD_DEPENDS} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= lthack USE_ICONV= yes USE_GMAKE= yes diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile index 92c27acc126a..60642635c626 100644 --- a/japanese/scim-honoka-plugin-romkan/Makefile +++ b/japanese/scim-honoka-plugin-romkan/Makefile @@ -23,7 +23,7 @@ USE_GETTEXT= yes USE_GNOME= lthack gnomehack USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile index b7b1da05864f..047ede766857 100644 --- a/japanese/scim-honoka-plugin-wnn/Makefile +++ b/japanese/scim-honoka-plugin-wnn/Makefile @@ -26,7 +26,7 @@ USE_GETTEXT= yes USE_GNOME= lthack gnomehack USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile index 16e3d932ed0f..bce4f2ac9157 100644 --- a/japanese/scim-honoka/Makefile +++ b/japanese/scim-honoka/Makefile @@ -23,7 +23,7 @@ USE_GETTEXT= yes USE_GNOME= lthack gnomehack USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile index 08ffdbe412f7..d0e8504b6119 100644 --- a/japanese/scim-skk/Makefile +++ b/japanese/scim-skk/Makefile @@ -18,7 +18,7 @@ COMMENT= SCIM IMEngine module like SKK BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/japanese/xyaku/Makefile b/japanese/xyaku/Makefile index 10fdf2a4afa1..b556a27516aa 100644 --- a/japanese/xyaku/Makefile +++ b/japanese/xyaku/Makefile @@ -31,7 +31,7 @@ RUN_DEPENDS+= ${EDICT_FILE}:${PORTSDIR}/japanese/edict .endif USE_RUBY= yes -USE_AUTOTOOLS= autoconf:213 libtool:15 +USE_AUTOTOOLS= autoconf:213 libtool:22 CONFIGURE_ARGS= --with-edict="${EDICT_FILE}" \ --with-ruby="${RUBY}" diff --git a/java/cacao/Makefile b/java/cacao/Makefile index ec2f3458b3af..2650cca30b88 100644 --- a/java/cacao/Makefile +++ b/java/cacao/Makefile @@ -6,7 +6,7 @@ PORTNAME= cacao PORTVERSION= 0.98 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PORTVERSION}/ diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile index d0d7d74809ce..1a6ba40cef89 100644 --- a/java/sablevm/Makefile +++ b/java/sablevm/Makefile @@ -7,7 +7,7 @@ PORTNAME= sablevm PORTVERSION= 1.13 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java devel MASTER_SITES= SF diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile index 136f2545ddcb..903ea3b795b1 100644 --- a/korean/eterm/Makefile +++ b/korean/eterm/Makefile @@ -18,7 +18,7 @@ COMMENT= X11 terminal emulator based on rxvt/xterm that supports korean RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/local/hmm12.pcf.gz:${PORTSDIR}/korean/hanyangfonts -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_XORG= x11 xext ice sm xt USE_GNOME= imlib diff --git a/korean/iiimf-le-hangul/Makefile b/korean/iiimf-le-hangul/Makefile index ea16e65d0378..6b1ee5db2e1c 100644 --- a/korean/iiimf-le-hangul/Makefile +++ b/korean/iiimf-le-hangul/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= i386 USE_XORG= x11 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/korean/imhangul/Makefile b/korean/imhangul/Makefile index bea45d2c960f..e6f9fb427349 100644 --- a/korean/imhangul/Makefile +++ b/korean/imhangul/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://kldp.net/frs/download.php/2808/ MAINTAINER= cjh@FreeBSD.org COMMENT= GTK+-2.0 hangul input module -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk20 diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile index 319ad360f0e2..3d138a179df0 100644 --- a/lang/Sather/Makefile +++ b/lang/Sather/Makefile @@ -20,7 +20,7 @@ COMMENT= Sather compiler # NOTE: currently build fails with threaded Tk # LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 -BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:${PORTSDIR}/devel/libtool15 +BUILD_DEPENDS= ${LOCALBASE}/bin/libtool:${PORTSDIR}/devel/libtool22 USE_BZIP2= yes USE_GMAKE= yes diff --git a/lang/ccscript/Makefile b/lang/ccscript/Makefile index c89bf1169f91..44dcf8cd2171 100644 --- a/lang/ccscript/Makefile +++ b/lang/ccscript/Makefile @@ -18,7 +18,9 @@ COMMENT= State-event driven class extendible C++ script interpreter LIB_DEPENDS= ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp -USE_AUTOTOOLS= libtool:15 +BROKEN= Does not build with libtool 2.2. + +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gnometarget GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/lang/cim/Makefile b/lang/cim/Makefile index 0fe61948449b..7053d71f088d 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/cim/ MAINTAINER= ports@FreeBSD.org COMMENT= Compiler for the SIMULA programming language -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index df2f4a4d7373..98de1b07caf6 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -43,7 +43,7 @@ WRKSRC= ${WRKDIR}/plt-${PORTVERSION}/src USE_ICONV= yes USE_GL= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env MAN1= drscheme.1 help-desk.1 mred.1 mzscheme.1 tex2page.1 diff --git a/lang/elan/Makefile b/lang/elan/Makefile index 11703746913e..0602aacff4f5 100644 --- a/lang/elan/Makefile +++ b/lang/elan/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} MAN1= elancc.1 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/lang/elk/Makefile b/lang/elk/Makefile index adf738407aac..d5c5ebecd6dd 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ USE_BZIP2= yes USE_MOTIF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile index 5570d9b1798c..11d55ba74989 100644 --- a/lang/ferite/Makefile +++ b/lang/ferite/Makefile @@ -18,7 +18,7 @@ COMMENT= An embeddable scripting language LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ xml2.5:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 470c413a132a..7350dae535a2 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -6,7 +6,7 @@ PORTNAME= gambas PORTVERSION= 1.0.19 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= SF @@ -16,7 +16,7 @@ COMMENT= Gambas Almost Means BASic LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl \ ml.0:${PORTSDIR}/math/ldouble -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 USE_KDELIBS_VER= 3 USE_GETTEXT= yes USE_BZIP2= yes diff --git a/lang/gcc42-withgcjawt/Makefile b/lang/gcc42-withgcjawt/Makefile index 566409955cba..482957981633 100644 --- a/lang/gcc42-withgcjawt/Makefile +++ b/lang/gcc42-withgcjawt/Makefile @@ -19,7 +19,7 @@ USE_XORG= xtst xt xaw xmu #weird libtool issue http://gcc.gnu.org/bugzilla/show_bug.cgi?id=28442 EXTRA_PATCHES+= ${.CURDIR}/files/patch-configure -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .if ${MACHINE_ARCH} != i386 BROKEN= Only for gcj supported platforms diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 6c113d6f1304..412737594d34 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -7,7 +7,7 @@ PORTNAME= guile PORTVERSION= 1.8.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= guile @@ -17,7 +17,7 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -USE_AUTOTOOLS= autoconf:262 libltdl:15 +USE_AUTOTOOLS= autoconf:262 libltdl:22 USE_GMAKE= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile index c567ada95f95..4567da002196 100644 --- a/lang/klogoturtle/Makefile +++ b/lang/klogoturtle/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= LOGO Interpreter for the KDE Desktop USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" post-patch: diff --git a/lang/libjit/Makefile b/lang/libjit/Makefile index 6c4068b5ffc7..a13917409d6e 100644 --- a/lang/libjit/Makefile +++ b/lang/libjit/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.savannah.gnu.org/releases/dotgnu-pnet/ MAINTAINER= ports@FreeBSD.org COMMENT= Libjit implements Just-In-Time compilation functionality -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/lang/libutils/Makefile b/lang/libutils/Makefile index 4be689915e11..31fadd3f4416 100644 --- a/lang/libutils/Makefile +++ b/lang/libutils/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Support lib for Tensile/NSL USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_ARGS= CFLAGS="${CFLAGS}" USE_LDCONFIG= yes diff --git a/lang/mono/Makefile b/lang/mono/Makefile index ba848ca90a12..6f4fc665917f 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes USE_BISON= build USE_GNOME= gnomehack glib20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5_BUILD= yes LIBTOOLFILES= configure libgc/configure GNU_CONFIGURE= yes diff --git a/lang/neko/Makefile b/lang/neko/Makefile index 7c4839d33f07..fe99bfe52ff2 100644 --- a/lang/neko/Makefile +++ b/lang/neko/Makefile @@ -16,7 +16,7 @@ COMMENT= The Neko Programming Language ONLY_FOR_ARCHS= i386 amd64 -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env USE_GMAKE= yes OPTIONS= APACHE13 "Build with mod_neko for Apache 1.3.x" off \ diff --git a/lang/njs/Makefile b/lang/njs/Makefile index 8115d2b94213..07a1b484e87e 100644 --- a/lang/njs/Makefile +++ b/lang/njs/Makefile @@ -19,7 +19,7 @@ COMMENT= NJS (NGS) is a standalone JavaScript/ECMAScript interpreter CONFLICTS= js-1.5.* USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-shared MAN1= js.1 jsdas.1 diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index 4943ee0c2cae..ae52171a7bf7 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= sdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile index 1d7d82b1444b..5dac07fe06a8 100644 --- a/lang/oo2c/Makefile +++ b/lang/oo2c/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc DOCSDIR= lib/${PORTNAME} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/lang/open-cobol-devel/Makefile b/lang/open-cobol-devel/Makefile index 81e344c5fb4a..bd93e673e7d8 100644 --- a/lang/open-cobol-devel/Makefile +++ b/lang/open-cobol-devel/Makefile @@ -21,7 +21,7 @@ LATEST_LINK= open-cobol-devel USE_GNOME= gnometarget USE_BDB= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile index c4675f6fe195..11d6a1b65453 100644 --- a/lang/open-cobol/Makefile +++ b/lang/open-cobol/Makefile @@ -22,7 +22,7 @@ CONFLICTS= open-cobol-1.[1]* USE_GNOME= gnometarget USE_BDB= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/lang/osb-jscore/Makefile b/lang/osb-jscore/Makefile index fcafe946c9a4..164c5da51643 100644 --- a/lang/osb-jscore/Makefile +++ b/lang/osb-jscore/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Gtk+ WebCore JavaScript interpreter USE_GNOME= gnomehack gnometarget gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile index 9b2e95e79ddd..a4d79892d5a4 100644 --- a/lang/pfe-devel/Makefile +++ b/lang/pfe-devel/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_PERL5_BUILD=yes USE_GCC= 4.2+ USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= pfe/configure MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile index 9b2e95e79ddd..a4d79892d5a4 100644 --- a/lang/pfe/Makefile +++ b/lang/pfe/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_PERL5_BUILD=yes USE_GCC= 4.2+ USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= pfe/configure MAKE_ARGS= pkgconfigdir="${PREFIX}/libdata/pkgconfig" diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index 08eae8d15ec0..02c1a6ded751 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -180,7 +180,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 .endif .if ${PHP_MODNAME} == "mcve" diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 95677fac1004..05dbbe16da11 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -182,7 +182,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 .endif .if ${PHP_MODNAME} == "mhash" diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 95677fac1004..05dbbe16da11 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -182,7 +182,7 @@ LIB_DEPENDS+= mcrypt.8:${PORTSDIR}/security/libmcrypt CONFIGURE_ARGS+=--with-mcrypt=${LOCALBASE} -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 .endif .if ${PHP_MODNAME} == "mhash" diff --git a/lang/plt-scheme/Makefile b/lang/plt-scheme/Makefile index a7d8a1b4a885..3f2b1557cfa2 100644 --- a/lang/plt-scheme/Makefile +++ b/lang/plt-scheme/Makefile @@ -41,7 +41,7 @@ WRKSRC= ${WRKDIR}/plt-${PORTVERSION}/src/build USE_ICONV= yes USE_GL= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env # no man files in this version: run plt-help for helpdesk MAN1= drscheme.1 mred.1 mzc.1 mzscheme.1 \ diff --git a/lang/pnetlib/Makefile b/lang/pnetlib/Makefile index f32aefb78abe..484e918168b5 100644 --- a/lang/pnetlib/Makefile +++ b/lang/pnetlib/Makefile @@ -23,7 +23,7 @@ USE_XLIB= yes .endif GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index a7d8a1b4a885..3f2b1557cfa2 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -41,7 +41,7 @@ WRKSRC= ${WRKDIR}/plt-${PORTVERSION}/src/build USE_ICONV= yes USE_GL= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env # no man files in this version: run plt-help for helpdesk MAN1= drscheme.1 mred.1 mzc.1 mzscheme.1 \ diff --git a/lang/racket/Makefile b/lang/racket/Makefile index a7d8a1b4a885..3f2b1557cfa2 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -41,7 +41,7 @@ WRKSRC= ${WRKDIR}/plt-${PORTVERSION}/src/build USE_ICONV= yes USE_GL= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env # no man files in this version: run plt-help for helpdesk MAN1= drscheme.1 mred.1 mzc.1 mzscheme.1 \ diff --git a/lang/sdcc-devel/Makefile b/lang/sdcc-devel/Makefile index 12a23b6748de..432b8f467d35 100644 --- a/lang/sdcc-devel/Makefile +++ b/lang/sdcc-devel/Makefile @@ -123,7 +123,7 @@ PLIST_SUB+= DEVLIB="" CONFIGURE_ARGS+= --disable-ucsim PLIST_SUB+= UCSIM="@comment " .else -USE_AUTOTOOLS+= libtool:15 +USE_AUTOTOOLS+= libtool:22 LIBTOOLFILES= sim/ucsim/configure PLIST_SUB+= UCSIM="" .endif diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index feb68331b0e8..752edc54a137 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -120,7 +120,7 @@ PLIST_SUB+= DEVLIB="" CONFIGURE_ARGS+= --disable-ucsim PLIST_SUB+= UCSIM="@comment " .else -USE_AUTOTOOLS+= libtool:15 +USE_AUTOTOOLS+= libtool:22 LIBTOOLFILES= sim/ucsim/configure PLIST_SUB+= UCSIM="" .endif diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index 85f0cf25aa8f..1081e6632c55 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \ OPTIONS= TCLTK "Enable Tcl/Tk binding" on \ PGSQL "PostgreSQL binding" on -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget pkgconfig USE_ICONV= yes USE_SQLITE= yes diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index 53932a69361f..38419a32de52 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -8,7 +8,7 @@ PORTNAME= balsa PORTVERSION= 2.3.28 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ DISTNAME= balsa-${PORTVERSION} @@ -31,7 +31,7 @@ USE_OPENSSL= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui gtkhtml3 \ libgnomeprintui USE_GETTEXT= yes -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 GNU_CONFIGURE= yes USE_ICONV= yes CONFIGURE_ARGS= --enable-threads \ diff --git a/mail/courier/Makefile b/mail/courier/Makefile index ac783066cbda..6fe7ec9e01d8 100644 --- a/mail/courier/Makefile +++ b/mail/courier/Makefile @@ -61,7 +61,7 @@ CALENDIR= /var/spool/calendar MIMETYPES= ${LOCALBASE}/etc/mime.types WITH_TRANSPORT= local esmtp dsn -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_FAM= yes USE_GETTEXT= yes diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index aa272ef8a959..8235aab9e30d 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -24,7 +24,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \ SIEVE "Build w. support for Sieve mail sorting language" off \ LDAP "Build with support for LDAP authentication" off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= YES USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile index 8c95d331c011..3ca5fffab8b6 100644 --- a/mail/dbmail21/Makefile +++ b/mail/dbmail21/Makefile @@ -22,7 +22,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \ SIEVE "Build w. support for Sieve mail sorting language" off \ LDAP "Build with support for LDAP authentication" off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= YES CONFIGURE_ARGS= --prefix=${PREFIX} USE_GMAKE= YES diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile index aa272ef8a959..8235aab9e30d 100644 --- a/mail/dbmail22/Makefile +++ b/mail/dbmail22/Makefile @@ -24,7 +24,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \ SIEVE "Build w. support for Sieve mail sorting language" off \ LDAP "Build with support for LDAP authentication" off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= YES USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh diff --git a/mail/dbmail23/Makefile b/mail/dbmail23/Makefile index 33afcd7a7e06..e44dc9ecd621 100644 --- a/mail/dbmail23/Makefile +++ b/mail/dbmail23/Makefile @@ -28,7 +28,7 @@ OPTIONS= MYSQL "Build with MySQL support" on \ LDAP "Build with support for LDAP authentication" off \ MANPAGES "Install man pages" on -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= YES USE_LDCONFIG= ${PREFIX}/lib/dbmail USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh dbmail-timsieved.sh diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 5ef09db28b59..6442dfe056af 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -93,7 +93,7 @@ OPTIONS+= CGI "Install CGI (pulls in Apache or see below)" off OPTIONS+= LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .ifdef(SNAP_DATE) USE_AUTOTOOLS+= autoconf:262:env automake:19 .endif diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 31fcf045efdb..074bf5424196 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -89,7 +89,7 @@ OPTIONS+= CGI "Install CGI (pulls in Apache or see below)" off OPTIONS+= LIGHTTPD "RUN_DEPEND on LightHTTPD, not Apache" off USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes #CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile index f8d15bf02dac..4e9cbcf09cb5 100644 --- a/mail/evolution-exchange/Makefile +++ b/mail/evolution-exchange/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= evolution:${PORTSDIR}/mail/evolution USE_BZIP2= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_BDB= 41 USE_OPENLDAP= yes diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 75fa18204423..2efccc09f603 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -25,7 +25,7 @@ USE_BISON= build USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack evolutiondataserver gtkhtml3 \ desktopfileutils gnomedocutils ltasneededhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_LDCONFIG= yes diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index cecad35f3d2c..ebee57f010c2 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library (written in C) for parsing and creating messages using MIME CONFLICTS= gmime-2.1.* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= YES USE_GNOME= glib12 USE_ICONV= yes diff --git a/mail/jamlib/Makefile b/mail/jamlib/Makefile index 0ed7446cbc60..f26193ad7420 100644 --- a/mail/jamlib/Makefile +++ b/mail/jamlib/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= jamlib MAINTAINER= ports@FreeBSD.org COMMENT= A JAM subroutine library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes NO_INSTALL_MANPAGES= yes USE_LDCONFIG= yes diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile index 697d5d8315ae..59f27dc71946 100644 --- a/mail/kbiff/Makefile +++ b/mail/kbiff/Makefile @@ -17,7 +17,7 @@ COMMENT= Mail notification utility for KDE with nice features USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-fast-perl MAN1= kbiff.1 diff --git a/mail/kcheckgmail/Makefile b/mail/kcheckgmail/Makefile index 0941d0896c64..07677ce5243d 100644 --- a/mail/kcheckgmail/Makefile +++ b/mail/kcheckgmail/Makefile @@ -16,7 +16,7 @@ COMMENT= A Gmail Notifier for KDE USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER=3 INSTALLS_ICONS= yes diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index de0d661c7390..1572d55f4fb5 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= mimelib.1:${PORTSDIR}/deskutils/kdepim3 USE_KDELIBS_VER= 3 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22:env GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile index 48a2c0b14f04..5aee533be143 100644 --- a/mail/libesmtp/Makefile +++ b/mail/libesmtp/Makefile @@ -18,7 +18,7 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= A library for posting electronic mail USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile index 3c93603819c5..44cbbe6342a0 100644 --- a/mail/libetpan/Makefile +++ b/mail/libetpan/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ sasl2.2:${PORTSDIR}/security/cyrus-sasl2 USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 autoconf:262 +USE_AUTOTOOLS= libtool:22 autoconf:262 USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/mail/libnewmail/Makefile b/mail/libnewmail/Makefile index ec77d88f5a67..8dc7e0c8ec6b 100644 --- a/mail/libnewmail/Makefile +++ b/mail/libnewmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= libnewmail PORTVERSION= 0.3 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= mail MASTER_SITES= http://0pointer.de/lennart/projects/libnewmail/ \ http://www.stud.uni-hamburg.de/~lennart/projects/libnewmail/ @@ -18,7 +18,7 @@ COMMENT= Generic mail checking library LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls \ oop.4:${PORTSDIR}/devel/liboop -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/mail/libspf/Makefile b/mail/libspf/Makefile index 27d86edceda7..f562f48c0525 100644 --- a/mail/libspf/Makefile +++ b/mail/libspf/Makefile @@ -16,7 +16,7 @@ MAINTAINER= mnag@FreeBSD.org COMMENT= Sender Policy Framework (SPF) library and client USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile index e15bce57a8c8..d4ec239c7fdb 100644 --- a/mail/libspf2-10/Makefile +++ b/mail/libspf2-10/Makefile @@ -19,7 +19,7 @@ CONFLICTS= ${PORTNAME}-1.2.* LATEST_LINK= ${PORTNAME}-${PORTVERSION:S/.//:R} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/mail/libspf2/Makefile b/mail/libspf2/Makefile index 092c1b409174..d56254600624 100644 --- a/mail/libspf2/Makefile +++ b/mail/libspf2/Makefile @@ -16,7 +16,7 @@ COMMENT= Sender Rewriting Scheme 2 C Implementation CONFLICTS= ${PORTNAME}-1.0.* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile index f06953b37259..1fcb08d65054 100644 --- a/mail/libsrs2/Makefile +++ b/mail/libsrs2/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= srs MAINTAINER= ports@FreeBSD.org COMMENT= Sender Rewriting Scheme 2 C Implementation -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile index 16a14749d266..428f91ddb2e9 100644 --- a/mail/libsrs_alt/Makefile +++ b/mail/libsrs_alt/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://srs.mirtol.com/ MAINTAINER= simond@irrelevant.org COMMENT= Sender Rewriting Scheme C Implementation -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_LDCONFIG= yes SHLIB_MAJOR= 1 diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index ec03c8618222..021f44bcd6a0 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -24,7 +24,7 @@ MAN8= perdition.8 MANCOMPRESSED= no -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" BDB_LIB=db3 diff --git a/mail/pfqueue/Makefile b/mail/pfqueue/Makefile index 8991f80309c7..8df7849a31ec 100644 --- a/mail/pfqueue/Makefile +++ b/mail/pfqueue/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= mnag@FreeBSD.org COMMENT= A console-based tool for handling Postfix 1, Postfix 2 and Exim queues -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile index 2c2a619e2769..9eca8273735e 100644 --- a/mail/pop3lite/Makefile +++ b/mail/pop3lite/Makefile @@ -7,7 +7,7 @@ PORTNAME= pop3lite PORTVERSION= 0.2.4a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,14 +15,20 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A flexible, modular RFC-compliant POP3 daemon -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 USE_GNOME= glib12 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" MAN5= pop3lite.conf.5 MAN8= pop3lite.8 INFO= pop3lite-admin +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/configure + .include <bsd.port.mk> diff --git a/mail/pop3lite/files/patch-libtool22 b/mail/pop3lite/files/patch-libtool22 new file mode 100644 index 000000000000..689e80be2264 --- /dev/null +++ b/mail/pop3lite/files/patch-libtool22 @@ -0,0 +1,145 @@ +--- bootstrap.mk.orig 2009-07-15 09:34:19.000000000 -0500 ++++ bootstrap.mk 2009-07-15 09:34:31.000000000 -0500 +@@ -49,11 +49,7 @@ + endef + + all: bootstrap +-update: aclocal.m4 config.h.in Makefile.in ltmain.sh configure \ +- update-libltdl +-update-libltdl: gnu/libltdl/aclocal.m4 gnu/libltdl/config.h.in \ +- gnu/libltdl/Makefile.in gnu/libltdl/ltmain.sh \ +- gnu/libltdl/configure ++update: aclocal.m4 config.h.in Makefile.in ltmain.sh configure + + check-autoconf check-aclocal check-automake check-libtool \ + check-libtoolize check-autoheader: check-%: +@@ -66,42 +62,26 @@ + fi + + bootstrap: bootstrap-libtoolize bootstrap-aclocal bootstrap-autoheader \ +- bootstrap-automake bootstrap-autoconf bootstrap-ltdl ++ bootstrap-automake bootstrap-autoconf + + bootstrap-libtoolize bootstrap-aclocal bootstrap-autoheader \ + bootstrap-automake bootstrap-autoconf: bootstrap-%: check-% + $($*) $(P3L_$*_OPTIONS) + +-bootstrap-ltdl: check-autoconf check-automake check-aclocal check-autoheader +- cd gnu/libltdl && $(aclocal) +- cd gnu/libltdl && $(autoheader) +- cd gnu/libltdl && $(automake) $(P3L_automake_OPTIONS) +- cd gnu/libltdl && $(autoconf) $(P3L_autoconf_OPTIONS) + +-gnu/libltdl/aclocal.m4: gnu/libltdl/configure.ac +- cd gnu/libltdl && $(aclocal) + aclocal.m4: configure.ac + $(aclocal) $(P3L_aclocal_OPTIONS) + +-gnu/libltdl/config.h.in: gnu/libltdl/aclocal.m4 gnu/libltdl/configure.ac +- cd gnu/libltdl && $(autoheader) +- touch $@ + config.h.in: aclocal.m4 configure.ac + $(autoheader) $(P3L_autoheader_OPTIONS) + touch $@ + +-gnu/libltdl/Makefile.in: gnu/libltdl/configure.ac gnu/libltdl/Makefile.am +- cd gnu/libltdl && $(automake) $(P3L_automake_OPTIONS) + Makefile.in: configure.ac Makefile.am + $(automake) $(P3L_automake_OPTIONS) + +-gnu/libltdl/ltmain.sh: gnu/libltdl/Makefile.am gnu/libltdl/configure.ac +- cd gnu/libltdl && $(libtoolize) $(P3L_libtoolize_OPTIONS) + ltmain.sh: Makefile.am configure.ac + $(libtoolize) $(P3L_libtoolize_OPTIONS) + +-gnu/libltdl/configure: gnu/libltdl/aclocal.m4 gnu/libltdl/configure.ac +- cd gnu/libltdl && $(autoconf) $(P3L_autoconf_OPTIONS) + configure: aclocal.m4 configure.ac + $(autoconf) $(P3L_autoconf_OPTIONS) + +@@ -111,4 +91,4 @@ + .PHONY: check-autoconf check-aclocal check-automake check-libtool \ + check-libtoolize check-autoheader boostrap boostrap-libtoolize \ + bootstrap-aclocal bootstrap-autoheader bootstrap-automake \ +- bootstrap-autoconf bootstrap-ltdl update update-libltdl ++ bootstrap-autoconf update +--- configure.orig 2009-07-15 09:29:11.000000000 -0500 ++++ configure 2009-07-15 09:31:35.000000000 -0500 +@@ -300,7 +300,7 @@ + # include <unistd.h> + #endif" + +-ac_subdirs_all="$ac_subdirs_all gnu/libltdl" ++ac_subdirs_all="$ac_subdirs_all" + + # Initialize some variables set by options. + ac_init_help= +@@ -3144,15 +3144,8 @@ + + fi + +- case $enable_ltdl_convenience in +- no) { { echo "$as_me:3148: error: this package needs a convenience libltdl" >&5 +-echo "$as_me: error: this package needs a convenience libltdl" >&2;} +- { (exit 1); exit 1; }; } ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL='${top_builddir}/'gnu/libltdl/libltdlc.la +- INCLTDL='-I${top_srcdir}/'gnu/libltdl ++LIBLTDL='-lltdl' ++INCLTDL='-I/usr/local/include' + + # Check whether --enable-shared or --disable-shared was given. + if test "${enable_shared+set}" = set; then +@@ -10374,7 +10367,7 @@ + P3L_BUILTIN_LIST=`echo "$P3L_BUILTIN_LIST" | sed -e "s% test-modules % %g"` + fi + +-subdirs="$subdirs gnu/libltdl" ++subdirs="$subdirs" + + if test "x$static_daemon" != "xno" + then +--- gnu/Makefile.in.orig 2009-07-15 09:35:48.000000000 -0500 ++++ gnu/Makefile.in 2009-07-15 09:35:51.000000000 -0500 +@@ -138,7 +138,7 @@ + install_sh = @install_sh@ + moddocdir = @moddocdir@ + +-SUBDIRS = getopt libltdl md5 ++SUBDIRS = getopt md5 + + EXTRA_DIST = README + subdir = gnu +--- src/Makefile.in.orig 2009-07-15 09:37:37.000000000 -0500 ++++ src/Makefile.in 2009-07-15 09:37:39.000000000 -0500 +@@ -143,7 +143,7 @@ + CLEANFILES = *~ TAGS gmon.out builtin-modules.c + DISTCLEANFILES = stamp-builtin depcomp + +-LTDL_LIB = $(top_builddir)/gnu/libltdl/libltdlc.la ++LTDL_LIB = -lltdl + + @HAVE_MD5_LIB_TRUE@MD5_LIB = -lmd + @HAVE_MD5_LIB_FALSE@MD5_LIB = $(top_builddir)/gnu/md5/libmd5.la +@@ -157,7 +157,6 @@ + $(EXTRA_CFLAGS) + + INCLUDES = -I$(top_builddir)/includes \ +- -I$(top_srcdir)/gnu/libltdl \ + -I$(top_srcdir)/includes \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ + -DMODULEDIR=\"$(pkglibdir)\" \ +@@ -204,10 +203,8 @@ + misc.$(OBJEXT) module.$(OBJEXT) standalone.$(OBJEXT) + nodist_pop3lite_OBJECTS = builtin-modules.$(OBJEXT) + pop3lite_OBJECTS = $(am_pop3lite_OBJECTS) $(nodist_pop3lite_OBJECTS) +-@HAVE_MD5_LIB_TRUE@pop3lite_DEPENDENCIES = \ +-@HAVE_MD5_LIB_TRUE@ $(top_builddir)/gnu/libltdl/libltdlc.la ++@HAVE_MD5_LIB_TRUE@pop3lite_DEPENDENCIES = + @HAVE_MD5_LIB_FALSE@pop3lite_DEPENDENCIES = \ +-@HAVE_MD5_LIB_FALSE@ $(top_builddir)/gnu/libltdl/libltdlc.la \ + @HAVE_MD5_LIB_FALSE@ $(top_builddir)/gnu/md5/libmd5.la + + DEFS = @DEFS@ diff --git a/mail/popular/Makefile b/mail/popular/Makefile index 3b3109ebb75e..9c4889c93093 100644 --- a/mail/popular/Makefile +++ b/mail/popular/Makefile @@ -16,7 +16,7 @@ COMMENT= Suite of programs for setting up large POP3 server systems BUILD_DEPENDS= ${SITE_PERL}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_OPENSSL= yes diff --git a/mail/whoson/Makefile b/mail/whoson/Makefile index 957da75f1caa..32100897a2a3 100644 --- a/mail/whoson/Makefile +++ b/mail/whoson/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= sem@FreeBSD.org COMMENT= Implementation of `WHO iS ONline' protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-config=${PREFIX}/etc/whoson.conf USE_LDCONFIG= yes diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index d43f21917f6e..e97f9f2e2413 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -20,7 +20,7 @@ COMMENT= An X Window System application for receiving electronic mail LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ gdbm.3:${PORTSDIR}/databases/gdbm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= glib12 USE_GMAKE= yes diff --git a/math/GiNaC/Makefile b/math/GiNaC/Makefile index 6ce8645963cd..92c64b94bdac 100644 --- a/math/GiNaC/Makefile +++ b/math/GiNaC/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= cln.5:${PORTSDIR}/math/cln USE_BZIP2= yes USE_GNOME= gnomehack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile index 721bd3fa1dc7..c005be3a6896 100644 --- a/math/blitz++/Makefile +++ b/math/blitz++/Makefile @@ -25,7 +25,7 @@ MAKE_ARGS= NOPORTDOCS=yes .endif USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget gnomehack CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/math/cln/Makefile b/math/cln/Makefile index f55ab3071b14..c107b638a684 100644 --- a/math/cln/Makefile +++ b/math/cln/Makefile @@ -19,7 +19,7 @@ COMMENT= Class Library for Numbers LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_GMAKE= yes diff --git a/math/dieharder/Makefile b/math/dieharder/Makefile index e9e9d1dadb30..16d77356537b 100644 --- a/math/dieharder/Makefile +++ b/math/dieharder/Makefile @@ -16,13 +16,20 @@ COMMENT= A random number generator testsuite LIB_DEPENDS= gsl:${PORTSDIR}/math/gsl -USE_AUTOTOOLS= aclocal:110 autoheader:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= yes MAN1= dieharder.1 MAN3= libdieharder.3 +post-patch: + @${REINPLACE_CMD} -e "s|./configure|#./configure|g" \ + ${WRKSRC}/autogen.sh + run-autotools: @(cd ${WRKSRC}; ${SETENV} ${AUTOTOOLS_ENV} ${SH} ./autogen.sh) + @${REINPLACE_CMD} -e "/^ltmain=/!s^\$$ac_aux_dir/ltmain.sh^${LIBTOOLFLAGS} ${LTMAIN}^g" \ + -e '/^LIBTOOL=/s^\$$(top_builddir)/libtool^${LIBTOOL}^g' \ + ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/math/fftw/Makefile b/math/fftw/Makefile index f0cfdc064d7d..4937c7651c23 100644 --- a/math/fftw/Makefile +++ b/math/fftw/Makefile @@ -22,7 +22,7 @@ COMMENT?= Fast C routines to compute the Discrete Fourier Transform FFTW_FLAVOR?= default FFTW_SUFIX= -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_FORTRAN= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/math/fityk/Makefile b/math/fityk/Makefile index 3358b6f1ce49..643e4112a37a 100644 --- a/math/fityk/Makefile +++ b/math/fityk/Makefile @@ -23,7 +23,7 @@ USE_GNOME= gtk20 USE_WX= 2.8+ WX_CONF_ARGS= absolute USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-xylib USE_LDCONFIG= yes diff --git a/math/freefem/Makefile b/math/freefem/Makefile index d06d10bfce90..48d0607296a9 100644 --- a/math/freefem/Makefile +++ b/math/freefem/Makefile @@ -16,7 +16,7 @@ COMMENT= A language for the Finite Element Method USE_XORG= ice sm x11 xt USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= freefem.1 diff --git a/math/fung-calc/Makefile b/math/fung-calc/Makefile index 69046f2c74b9..82b73161ade9 100644 --- a/math/fung-calc/Makefile +++ b/math/fung-calc/Makefile @@ -18,7 +18,7 @@ USE_KDELIBS_VER=3 USE_GL= glut USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" pre-configure: diff --git a/math/gambit/Makefile b/math/gambit/Makefile index b954ced76426..613a62e129ec 100644 --- a/math/gambit/Makefile +++ b/math/gambit/Makefile @@ -17,7 +17,7 @@ COMMENT= A library of tools for doing computation in game theory USE_GNOME= gnometarget gtk20 USE_WX= 2.6+ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile index fe8f4671df03..59199f5fa4ce 100644 --- a/math/gcalctool/Makefile +++ b/math/gcalctool/Makefile @@ -22,7 +22,7 @@ USE_BISON= build INSTALLS_OMF= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack intlhack gconf2 gnomedocutils libglade2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/gmp/Makefile b/math/gmp/Makefile index 44428141fe31..8bf24ff8bef1 100644 --- a/math/gmp/Makefile +++ b/math/gmp/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A free library for arbitrary precision arithmetic USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --enable-cxx diff --git a/math/gretl/Makefile b/math/gretl/Makefile index e41f77664d22..359c436a775f 100644 --- a/math/gretl/Makefile +++ b/math/gretl/Makefile @@ -24,7 +24,7 @@ WANT_GNOME= yes USE_GNOME= gnomehier gtk20 gtksourceview2 libxml2 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${GCCLIBDIR}" CONFIGURE_ARGS= --enable-static --enable-shared --with-gmake --without-gnome diff --git a/math/guppi/Makefile b/math/guppi/Makefile index 00e2e8f34ae7..93bc585a00c9 100644 --- a/math/guppi/Makefile +++ b/math/guppi/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomelibs bonobo libglade gal gnometarget USE_PYTHON= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-gnumeric --enable-explicit-python-linking diff --git a/math/koctave/Makefile b/math/koctave/Makefile index 2773988693f5..3aa8231ab4ca 100644 --- a/math/koctave/Makefile +++ b/math/koctave/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= octave:${PORTSDIR}/math/octave USE_QT_VER= 3 USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: ${REINPLACE_CMD} -e '/kde_appsdir/s|applnk||g' ${WRKSRC}/configure diff --git a/math/labplot/Makefile b/math/labplot/Makefile index 586f008a4420..2d57b91fe681 100644 --- a/math/labplot/Makefile +++ b/math/labplot/Makefile @@ -28,7 +28,7 @@ USE_QT_VER= 3 USE_KDELIBS_VER=3 USE_GL= glu USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile index 689908f07aeb..d5c4ad97ee31 100644 --- a/math/lapack++/Makefile +++ b/math/lapack++/Makefile @@ -36,7 +36,7 @@ LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack USE_FORTRAN= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes .if defined(WITH_ATLAS) BLAS_LIB= -L${LOCALBASE}/lib -lf77blas -latlas diff --git a/math/libgmp4/Makefile b/math/libgmp4/Makefile index 44428141fe31..8bf24ff8bef1 100644 --- a/math/libgmp4/Makefile +++ b/math/libgmp4/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A free library for arbitrary precision arithmetic USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_ARGS= --enable-cxx diff --git a/math/libmath++/Makefile b/math/libmath++/Makefile index 54d76377c2f7..19c5a1c0eb97 100644 --- a/math/libmath++/Makefile +++ b/math/libmath++/Makefile @@ -13,9 +13,9 @@ MASTER_SITES= http://www.robertjohnkaper.com/downloads/atlantik/ MAINTAINER= jhb@FreeBSD.org COMMENT= C++ Library for Symbolic and Numeric Calculus Applications -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/math/libneural/Makefile b/math/libneural/Makefile index 5aee5329cab3..702e98f4179e 100644 --- a/math/libneural/Makefile +++ b/math/libneural/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/ MAINTAINER= ports@FreeBSD.org COMMENT= C++ implementation of the classic 3-layer perceptron in library form -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/math/libqalculate/Makefile b/math/libqalculate/Makefile index cd0332aeb904..bfabb984890f 100644 --- a/math/libqalculate/Makefile +++ b/math/libqalculate/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= cln.5:${PORTSDIR}/math/cln USE_GNOME= glib20 gnomehack gnometarget intlhack libxml2 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/math/ltl/Makefile b/math/ltl/Makefile index 330f1e2fce9e..fa15868feba7 100644 --- a/math/ltl/Makefile +++ b/math/ltl/Makefile @@ -16,7 +16,7 @@ COMMENT= A C++ class SSE library for scientific computing USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-cxx=gcc --disable-doxygen --prefix=${PREFIX} --includedir=${PREFIX}/include/LTL MAKE_ENV= prefix=${PREFIX} exec_prefix=${PREFIX} MAKE_ARGS+= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/math/pgcalc/Makefile b/math/pgcalc/Makefile index f0b39452b8e7..9e2a5076e0b7 100644 --- a/math/pgcalc/Makefile +++ b/math/pgcalc/Makefile @@ -17,7 +17,7 @@ COMMENT= A powerful scientific skinnable calculator USE_QT_VER= 3 USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/math/plplot/Makefile b/math/plplot/Makefile index 060875fbcea5..7689634c5775 100644 --- a/math/plplot/Makefile +++ b/math/plplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= plplot PORTVERSION= 5.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math science MASTER_SITES= SF @@ -18,7 +18,7 @@ LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \ gd.4:${PORTSDIR}/graphics/gd \ qhull.5:${PORTSDIR}/math/qhull -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_PERL5_BUILD=yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/math/pspp/Makefile b/math/pspp/Makefile index db9aa794295c..62c8bec69404 100644 --- a/math/pspp/Makefile +++ b/math/pspp/Makefile @@ -24,7 +24,7 @@ USE_GNOME= libxml2 USE_PERL5_BUILD=yes USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" INFO= pspp pspp-dev diff --git a/math/qhull/Makefile b/math/qhull/Makefile index 5bdb03b8b359..d4ddbc802564 100644 --- a/math/qhull/Makefile +++ b/math/qhull/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-2003.1 MAINTAINER= stephen@missouri.edu COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/math/qhull5/Makefile b/math/qhull5/Makefile index 5bdb03b8b359..d4ddbc802564 100644 --- a/math/qhull5/Makefile +++ b/math/qhull5/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-2003.1 MAINTAINER= stephen@missouri.edu COMMENT= Qhull computes convex hulls, Delaunay triangulations and halfspaces -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/math/rkward/Makefile b/math/rkward/Makefile index e98614062091..8cc52671adcf 100644 --- a/math/rkward/Makefile +++ b/math/rkward/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 USE_PHP= yes WANT_PHP_CLI= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --disable-fast-perl diff --git a/math/spar/Makefile b/math/spar/Makefile index d93d4d50dc52..cd56780879a1 100644 --- a/math/spar/Makefile +++ b/math/spar/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A modular math parser -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile index 2701b59324c3..2e02c92a3b55 100644 --- a/math/tvmet/Makefile +++ b/math/tvmet/Makefile @@ -16,7 +16,7 @@ COMMENT= Tiny Vector and Matrix template library USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_ARGS= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" MAN1= tvmet-config.1 diff --git a/math/yacas/Makefile b/math/yacas/Makefile index 65237041e944..f8f48be08fd5 100644 --- a/math/yacas/Makefile +++ b/math/yacas/Makefile @@ -17,7 +17,7 @@ COMMENT= Yet Another Computer Algebra System LIB_DEPENDS= gsl.13:${PORTSDIR}/math/gsl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5_BUILD= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/misc/bibletime-kde3/Makefile b/misc/bibletime-kde3/Makefile index 229911b27d1f..5f55aeb458d4 100644 --- a/misc/bibletime-kde3/Makefile +++ b/misc/bibletime-kde3/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --with-sword-dir=${LOCALBASE} --with-clucene-dir=${LOCALBASE} PORTSCOUT= ignore:1 USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/misc/kaddressbook-plugins/Makefile b/misc/kaddressbook-plugins/Makefile index 8149dfe34b8e..c62807413054 100644 --- a/misc/kaddressbook-plugins/Makefile +++ b/misc/kaddressbook-plugins/Makefile @@ -26,7 +26,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index 4c1aeed6d024..0709c172baa0 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -26,7 +26,7 @@ PREFIX= ${KDE_PREFIX} USE_BZIP2= yes USE_XORG= xpm USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--enable-libusb=${LOCALBASE} \ --disable-ocamlsolver diff --git a/misc/kdeedu3/files/patch-libtool22 b/misc/kdeedu3/files/patch-libtool22 new file mode 100644 index 000000000000..ab26e07869e3 --- /dev/null +++ b/misc/kdeedu3/files/patch-libtool22 @@ -0,0 +1,11 @@ +--- kalzium/src/Makefile.in.orig 2009-07-01 22:47:40.000000000 -0500 ++++ kalzium/src/Makefile.in 2009-07-01 22:49:40.000000000 -0500 +@@ -478,7 +478,7 @@ + moleculeparser.cpp \ + tempunit.cpp settings_colors.cpp settings_misc.cpp settings_units.cpp plotsetupwidget.cpp molcalcwidgetbase.cpp timewidget.cpp somwidget.cpp spectrumview.cpp prefs.cpp + +-kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) -L$(OCAMLLIB) -L$(FACILELIB) $(EQCHEM_LDADD) ++kalzium_LDADD = ../../libkdeedu/kdeeduplot/libkdeeduplot.la ../../libkdeedu/kdeeduui/libkdeeduui.la $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(EQCHEM_LDADD) + KDE_CXXFLAGS = -D_ISOC99_SOURCE + SUBDIRS = icons elementpics data $(EQCHEM_SUB) + EXTRA_DIST = main.cpp \ diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile index 59a9536cf404..46f0caf26028 100644 --- a/misc/kdeutils3/Makefile +++ b/misc/kdeutils3/Makefile @@ -29,7 +29,7 @@ USE_KDEBASE_VER=3 USE_PYTHON= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 DO_NOT_COMPILE+=klaptopdaemon kmilo CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}" CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE} diff --git a/misc/kfile-plugins/Makefile b/misc/kfile-plugins/Makefile index 7b06a2c1f6a7..3636f675f521 100644 --- a/misc/kfile-plugins/Makefile +++ b/misc/kfile-plugins/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/kicker-applets/Makefile b/misc/kicker-applets/Makefile index 7d8c8de5fba4..9d075e609648 100644 --- a/misc/kicker-applets/Makefile +++ b/misc/kicker-applets/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/knewsticker-scripts/Makefile b/misc/knewsticker-scripts/Makefile index 158911961ada..5e0b8fdcd084 100644 --- a/misc/knewsticker-scripts/Makefile +++ b/misc/knewsticker-scripts/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/konq-plugins/Makefile b/misc/konq-plugins/Makefile index a32aeb109418..bdcec81050b7 100644 --- a/misc/konq-plugins/Makefile +++ b/misc/konq-plugins/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile index 672f1041a7be..816ac0b079c5 100644 --- a/misc/krecipes-kde4/Makefile +++ b/misc/krecipes-kde4/Makefile @@ -15,7 +15,7 @@ MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 OPTIONS= SQLITE "Support for SQLite backend" on \ MYSQL "Support for MySQL backend" off \ diff --git a/misc/krecipes/Makefile b/misc/krecipes/Makefile index 672f1041a7be..816ac0b079c5 100644 --- a/misc/krecipes/Makefile +++ b/misc/krecipes/Makefile @@ -15,7 +15,7 @@ MAINTAINER= hank@millerfarm.com COMMENT= Recipe database for cooks USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 OPTIONS= SQLITE "Support for SQLite backend" on \ MYSQL "Support for MySQL backend" off \ diff --git a/misc/ksig/Makefile b/misc/ksig/Makefile index a1203ed58d88..4c88cb57832b 100644 --- a/misc/ksig/Makefile +++ b/misc/ksig/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile index 7597c2178c02..5627c330a29b 100644 --- a/misc/kwatch/Makefile +++ b/misc/kwatch/Makefile @@ -16,7 +16,7 @@ COMMENT= KDE/Qt log file viewer USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes INSTALLS_ICONS= yes diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile index 7d342af61d57..af85538fac66 100644 --- a/misc/libmcal/Makefile +++ b/misc/libmcal/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmcal PORTVERSION= 0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz MAINTAINER= thierry@FreeBSD.org COMMENT= Modular Calendar Access Library -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --with-mstore --with-icap \ diff --git a/misc/linm/Makefile b/misc/linm/Makefile index 43f3f82c7555..61b6ea12e66e 100644 --- a/misc/linm/Makefile +++ b/misc/linm/Makefile @@ -18,7 +18,7 @@ COMMENT= Clone of Mdir, mc-style terminal file manager BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_OPENSSL= yes USE_GMAKE= yes diff --git a/misc/renamedlgplugins/Makefile b/misc/renamedlgplugins/Makefile index d80f5e2810e9..2a3b4453260a 100644 --- a/misc/renamedlgplugins/Makefile +++ b/misc/renamedlgplugins/Makefile @@ -22,7 +22,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/misc/skyutils/Makefile b/misc/skyutils/Makefile index 04e885e7e3c9..f4e0b6f37a2a 100644 --- a/misc/skyutils/Makefile +++ b/misc/skyutils/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A library required by smssend (same author) GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 0278cde6146b..3bb1023516dc 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes CONFIGURE_ARGS+= --disable-cdtext diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile index 0278cde6146b..3bb1023516dc 100644 --- a/misc/tellico/Makefile +++ b/misc/tellico/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes CONFIGURE_ARGS+= --disable-cdtext diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile index 0553cf684004..d199f6501e5c 100644 --- a/misc/xdelta/Makefile +++ b/misc/xdelta/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= skv@FreeBSD.org COMMENT= A diff/patch utility for binary files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= glib20 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/misc/xosd/Makefile b/misc/xosd/Makefile index fffb44f1961f..ba84f84849ea 100644 --- a/misc/xosd/Makefile +++ b/misc/xosd/Makefile @@ -20,7 +20,7 @@ XMMS_CONFIG?= ${LOCALBASE}/bin/xmms-config USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 xext xt sm ice -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= LIBS=${PTHREAD_LIBS}' -L${LOCALBASE}/lib' \ CFLAGS='${CFLAGS}' LOCALBASE='${LOCALBASE}' \ diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index b6e07e6d271f..ed201df2dc51 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg USE_SUBMAKE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_LDCONFIG= yes diff --git a/multimedia/beep-media-player/Makefile b/multimedia/beep-media-player/Makefile index ab1cda53a0c8..dd6fd93c95e6 100644 --- a/multimedia/beep-media-player/Makefile +++ b/multimedia/beep-media-player/Makefile @@ -19,7 +19,7 @@ COMMENT= GTK2 multimedia player USE_GNOME= gtk20 libglade2 desktopfileutils WANT_GNOME= yes USE_XORG= x11 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index 63f7c46aca3b..c4c114cf5b7e 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -7,7 +7,7 @@ PORTNAME= camserv PORTVERSION= 0.5.1 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -22,7 +22,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ ONLY_FOR_ARCHS= i386 alpha -USE_AUTOTOOLS= autoconf:262 libtool:15 libltdl:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 libltdl:22 USE_EFL= imlib2 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile index 7771c9b3f4c2..82e142906423 100644 --- a/multimedia/clutter-gst/Makefile +++ b/multimedia/clutter-gst/Makefile @@ -17,7 +17,7 @@ COMMENT= Clutter GStreamer integration LIB_DEPENDS= clutter-glx-0.8:${PORTSDIR}/graphics/clutter USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack ltverhack gnomeprefix USE_GSTREAMER= yes USE_XORG= xp x11 diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile index 383823748675..427114c14df6 100644 --- a/multimedia/dirac/Makefile +++ b/multimedia/dirac/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= multimedia@FreeBSD.org COMMENT?= Open source video codec from the BBC -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig gnomehack gnometarget diff --git a/multimedia/grpplaylist/Makefile b/multimedia/grpplaylist/Makefile index 38732be331ad..760ccdc9fdc6 100644 --- a/multimedia/grpplaylist/Makefile +++ b/multimedia/grpplaylist/Makefile @@ -18,7 +18,7 @@ COMMENT= A playlist for Noatun LIB_DEPENDS= noatun:${PORTSDIR}/multimedia/kdemultimedia3 USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile index f80ea67f8f5c..d3343662e57e 100644 --- a/multimedia/gstreamer-plugins-buzztard/Makefile +++ b/multimedia/gstreamer-plugins-buzztard/Makefile @@ -18,7 +18,7 @@ COMMENT= Buzztard gstreamer plugins LIB_DEPENDS= fluidsynth.2:${PORTSDIR}/audio/fluidsynth -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GSTREAMER= yes USE_GNOME= gnomehack ltverhack USE_LDCONFIG= yes diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile index cab943ea3200..5b36e3b24836 100644 --- a/multimedia/gstreamer-plugins/Makefile +++ b/multimedia/gstreamer-plugins/Makefile @@ -52,7 +52,7 @@ WANT_GSTREAMER= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME+= gnomehack gnometarget pkgconfig ltverhack ltasneededhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GST_PLUGIN?= base CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index 299eec90b28b..030ae89fd3be 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -26,7 +26,7 @@ USE_GMAKE= yes WANT_GNOME= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack ltasneededhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-tests \ --disable-examples \ --disable-docs-build \ diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile index ae24092d02e4..5d3fe5d3393d 100644 --- a/multimedia/gxine/Makefile +++ b/multimedia/gxine/Makefile @@ -18,7 +18,7 @@ COMMENT= An alternative GUI for the Xine media player LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 gnomehier USE_GMAKE= yes USE_GCC= 4.2+ diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile index e86d65e633a6..fa4bac32b40a 100644 --- a/multimedia/handbrake/Makefile +++ b/multimedia/handbrake/Makefile @@ -38,7 +38,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 aclocal:110 +USE_AUTOTOOLS= libtool:22 aclocal:110 LIBTOOLFILES= ${WRKSRC}/configure diff --git a/multimedia/hayes/Makefile b/multimedia/hayes/Makefile index 21bd07dcbad4..4d2ef28317b8 100644 --- a/multimedia/hayes/Makefile +++ b/multimedia/hayes/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= noatun:${PORTSDIR}/multimedia/kdemultimedia3 USE_KDEBASE_VER= 3 USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" post-patch: diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile index 79eba1421362..a960cc4172ca 100644 --- a/multimedia/k9copy-kde4/Makefile +++ b/multimedia/k9copy-kde4/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_LDCONFIG= yes diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile index 79eba1421362..a960cc4172ca 100644 --- a/multimedia/k9copy/Makefile +++ b/multimedia/k9copy/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_LDCONFIG= yes diff --git a/multimedia/kaffeine-mozilla/Makefile b/multimedia/kaffeine-mozilla/Makefile index 18cfd25e38d3..5ac2f902b262 100644 --- a/multimedia/kaffeine-mozilla/Makefile +++ b/multimedia/kaffeine-mozilla/Makefile @@ -23,7 +23,7 @@ USE_WEBPLUGINS= native WEBPLUGINS_FILES=kaffeineplugin.so GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.pre.mk> .include "${PORTSDIR}/www/firefox/Makefile.webplugins" diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile index c285b46118d2..4f788bfc40e6 100644 --- a/multimedia/kaffeine/Makefile +++ b/multimedia/kaffeine/Makefile @@ -23,7 +23,7 @@ USE_KDELIBS_VER= 3 USE_GMAKE= yes USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${WRKSRC}" CFLAGS="${CFLAGS} -I${WRKSRC}" DVB_HEADERS= ca.h dmx.h frontend.h net.h audio.h video.h diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 5d7757268204..653b31b59219 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -33,7 +33,7 @@ PREFIX= ${KDE_PREFIX} USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAKE_ENV= ${CONFIGURE_ENV} diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile index b58a72941b87..fd4d68cdb9c4 100644 --- a/multimedia/kmplayer/Makefile +++ b/multimedia/kmplayer/Makefile @@ -30,7 +30,7 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= atk glib20 gtk20 libxml2 pango # See above WANT_GSTREAMER= yes # Can't be set after bsd.port.pre.mk diff --git a/multimedia/konverter/Makefile b/multimedia/konverter/Makefile index ccad01a83849..b585595f107e 100644 --- a/multimedia/konverter/Makefile +++ b/multimedia/konverter/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= avimerge:${PORTSDIR}/multimedia/transcode \ LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure diff --git a/multimedia/kplayer-kde4/Makefile b/multimedia/kplayer-kde4/Makefile index 8a677d660dc3..8e687561c51d 100644 --- a/multimedia/kplayer-kde4/Makefile +++ b/multimedia/kplayer-kde4/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes USE_PERL5_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22 pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/multimedia/kplayer/Makefile b/multimedia/kplayer/Makefile index 8a677d660dc3..8e687561c51d 100644 --- a/multimedia/kplayer/Makefile +++ b/multimedia/kplayer/Makefile @@ -21,7 +21,7 @@ USE_GMAKE= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes USE_PERL5_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22 pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/multimedia/ksubeditor/Makefile b/multimedia/ksubeditor/Makefile index 9de279dfb969..168868c27f1d 100644 --- a/multimedia/ksubeditor/Makefile +++ b/multimedia/ksubeditor/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION} USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-extract: @${TOUCH} ${WRKSRC}/stamp-h.in diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile index 0fc50cb7630e..08c9ab64fbb4 100644 --- a/multimedia/libdvbpsi/Makefile +++ b/multimedia/libdvbpsi/Makefile @@ -18,7 +18,7 @@ COMMENT= A library for MPEG TS and DVB PSI tables decoding and generation USE_DOS2UNIX= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes .if defined(WITH_DEBUG) CONFIGURE_ARGS= --enable-debug diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile index 2b5cc21dc596..8f0147dea0ff 100644 --- a/multimedia/libdvdcss/Makefile +++ b/multimedia/libdvdcss/Makefile @@ -18,7 +18,7 @@ COMMENT= Portable abstraction library for DVD decryption NO_CDROM= CSS code may violate the DMCA -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile index 708c372dea85..9e907987945e 100644 --- a/multimedia/libdvdnav/Makefile +++ b/multimedia/libdvdnav/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \ THREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_ARGS= --program-transform-name='' USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 autoconf:262 automake:16 +USE_AUTOTOOLS= libtool:22 autoconf:262 automake:16 post-patch: ${REINPLACE_CMD} -e \ diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile index f9f98795b20c..c0698a246d4b 100644 --- a/multimedia/libdvdplay/Makefile +++ b/multimedia/libdvdplay/Makefile @@ -17,7 +17,7 @@ COMMENT= Portable abstraction library for DVD navigation LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-dvdread-tree=${LOCALBASE}/include diff --git a/multimedia/libfame/Makefile b/multimedia/libfame/Makefile index eed530d3d778..0e8aa3069d83 100644 --- a/multimedia/libfame/Makefile +++ b/multimedia/libfame/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= fame MAINTAINER= multimedia@FreeBSD.org COMMENT= A video encoding library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile index 950b36880d73..b757416a043f 100644 --- a/multimedia/libmpeg2/Makefile +++ b/multimedia/libmpeg2/Makefile @@ -14,7 +14,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= A free library for decoding mpeg-2 and mpeg-1 video streams USE_GNOME= gnometarget ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index 13ddf0a97394..2b50f3748a13 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis USE_BZIP2= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= ltverhack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include " \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/multimedia/libxspf/Makefile b/multimedia/libxspf/Makefile index 5e06fe61f6ae..d978bfc08d1d 100644 --- a/multimedia/libxspf/Makefile +++ b/multimedia/libxspf/Makefile @@ -25,7 +25,7 @@ CONFIGURE_ARGS+=--with-expat=${LOCALBASE} --disable-test USE_BZIP2= yes USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index cd5e01506268..1ed405f47e36 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -23,7 +23,7 @@ WANT_SDL= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget WANT_GNOME= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/multimedia/mp4v2/Makefile b/multimedia/mp4v2/Makefile index b238507153f8..d3bb1e1f2175 100644 --- a/multimedia/mp4v2/Makefile +++ b/multimedia/mp4v2/Makefile @@ -17,7 +17,7 @@ PKGNAMESUFFIX= -libmp4v2 MAINTAINER= multimedia@FreeBSD.org COMMENT= Mpeg-4 library and tools from mpeg4ip -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_GNOME= gnometarget diff --git a/multimedia/mpeg4ip-libmp4v2/Makefile b/multimedia/mpeg4ip-libmp4v2/Makefile index b238507153f8..d3bb1e1f2175 100644 --- a/multimedia/mpeg4ip-libmp4v2/Makefile +++ b/multimedia/mpeg4ip-libmp4v2/Makefile @@ -17,7 +17,7 @@ PKGNAMESUFFIX= -libmp4v2 MAINTAINER= multimedia@FreeBSD.org COMMENT= Mpeg-4 library and tools from mpeg4ip -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_GNOME= gnometarget diff --git a/multimedia/nmm/Makefile b/multimedia/nmm/Makefile index 267729389cb1..35558e89bdab 100644 --- a/multimedia/nmm/Makefile +++ b/multimedia/nmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= nmm PORTVERSION= 1.0.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://www.motama.com/download/ @@ -36,16 +36,10 @@ USE_GNOME= lthack libxml2 # lthack + autotools stuff below? To verify! USE_GMAKE= yes USE_XORG= x11 -# -# The port will reconfigure in the build stage. Using the autotools rebuild -# does not work, it complains about some missing libtool stuff. By setting -# the :env part below, we are sure we get the tools installed so that -# the automatic rebuild via automake/autoconf works. Ideally this should -# be fixed correctly, but so far I haven't found the correct way... -# -USE_AUTOTOOLS= libltdl libtool:15 \ - autoconf:262:env autoheader:262:env \ - automake:19:env aclocal:19:env +USE_AUTOTOOLS= libltdl:22 libtool:22 \ + autoconf:262 autoheader:262 \ + automake:19 aclocal:19 +ACLOCAL_ARGS= -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I . CONFIGURE_ARGS= --program-prefix=nmm- \ --enable-final \ diff --git a/multimedia/nmm/pkg-plist b/multimedia/nmm/pkg-plist index cbc50058e842..90c1a89cb204 100644 --- a/multimedia/nmm/pkg-plist +++ b/multimedia/nmm/pkg-plist @@ -1192,363 +1192,483 @@ lib/nmm/dev-lib/libnmmWhiteNoiseNode.so lib/nmm/dev-lib/libnmmYUVDeInterlaceNode.so lib/nmm/dev-lib/libnmmYUVtoRGBConverterNode.so lib/nmm/dev-lib/libnmmYUVtoYUVConverterNode.so +lib/nmm/libnmmAC3DecodeNode.a lib/nmm/libnmmAC3DecodeNode.la lib/nmm/libnmmAC3DecodeNode.so lib/nmm/libnmmAC3DecodeNode.so.0 +lib/nmm/libnmmAC3ParseNode.a lib/nmm/libnmmAC3ParseNode.la lib/nmm/libnmmAC3ParseNode.so lib/nmm/libnmmAC3ParseNode.so.0 +lib/nmm/libnmmAVDemuxNode.a lib/nmm/libnmmAVDemuxNode.la lib/nmm/libnmmAVDemuxNode.so lib/nmm/libnmmAVDemuxNode.so.0 +lib/nmm/libnmmAVIReadNode.a lib/nmm/libnmmAVIReadNode.la lib/nmm/libnmmAVIReadNode.so lib/nmm/libnmmAVIReadNode.so.0 +lib/nmm/libnmmAVIWriteNode.a lib/nmm/libnmmAVIWriteNode.la lib/nmm/libnmmAVIWriteNode.so lib/nmm/libnmmAVIWriteNode.so.0 +lib/nmm/libnmmAVMuxNode.a lib/nmm/libnmmAVMuxNode.la lib/nmm/libnmmAVMuxNode.so lib/nmm/libnmmAVMuxNode.so.0 +lib/nmm/libnmmAudioMuxNode.a lib/nmm/libnmmAudioMuxNode.la lib/nmm/libnmmAudioMuxNode.so lib/nmm/libnmmAudioMuxNode.so.0 +lib/nmm/libnmmBrightnessNode.a lib/nmm/libnmmBrightnessNode.la lib/nmm/libnmmBrightnessNode.so lib/nmm/libnmmBrightnessNode.so.0 +lib/nmm/libnmmBufferDropNode.a lib/nmm/libnmmBufferDropNode.la lib/nmm/libnmmBufferDropNode.so lib/nmm/libnmmBufferDropNode.so.0 +lib/nmm/libnmmBufferDropNodeIDL.a lib/nmm/libnmmBufferDropNodeIDL.la lib/nmm/libnmmBufferDropNodeIDL.so lib/nmm/libnmmBufferDropNodeIDL.so.0 +lib/nmm/libnmmBufferShapingNode.a lib/nmm/libnmmBufferShapingNode.la lib/nmm/libnmmBufferShapingNode.so lib/nmm/libnmmBufferShapingNode.so.0 +lib/nmm/libnmmCopyNode.a lib/nmm/libnmmCopyNode.la lib/nmm/libnmmCopyNode.so lib/nmm/libnmmCopyNode.so.0 +lib/nmm/libnmmCopyNodeIDL.a lib/nmm/libnmmCopyNodeIDL.la lib/nmm/libnmmCopyNodeIDL.so lib/nmm/libnmmCopyNodeIDL.so.0 +lib/nmm/libnmmDVDNavReadNode.a lib/nmm/libnmmDVDNavReadNode.la lib/nmm/libnmmDVDNavReadNode.so lib/nmm/libnmmDVDNavReadNode.so.0 +lib/nmm/libnmmDVDReadNode.a lib/nmm/libnmmDVDReadNode.la lib/nmm/libnmmDVDReadNode.so lib/nmm/libnmmDVDReadNode.so.0 +lib/nmm/libnmmDevNullNode.a lib/nmm/libnmmDevNullNode.la lib/nmm/libnmmDevNullNode.so lib/nmm/libnmmDevNullNode.so.0 +lib/nmm/libnmmDummyAudioSinkNode.a lib/nmm/libnmmDummyAudioSinkNode.la lib/nmm/libnmmDummyAudioSinkNode.so lib/nmm/libnmmDummyAudioSinkNode.so.0 +lib/nmm/libnmmDummyVideoSinkNode.a lib/nmm/libnmmDummyVideoSinkNode.la lib/nmm/libnmmDummyVideoSinkNode.so lib/nmm/libnmmDummyVideoSinkNode.so.0 +lib/nmm/libnmmFFMpegAudioDecodeNode.a lib/nmm/libnmmFFMpegAudioDecodeNode.la lib/nmm/libnmmFFMpegAudioDecodeNode.so lib/nmm/libnmmFFMpegAudioDecodeNode.so.0 +lib/nmm/libnmmFFMpegAudioEncodeNode.a lib/nmm/libnmmFFMpegAudioEncodeNode.la lib/nmm/libnmmFFMpegAudioEncodeNode.so lib/nmm/libnmmFFMpegAudioEncodeNode.so.0 +lib/nmm/libnmmFFMpegDecodeNode.a lib/nmm/libnmmFFMpegDecodeNode.la lib/nmm/libnmmFFMpegDecodeNode.so lib/nmm/libnmmFFMpegDecodeNode.so.0 +lib/nmm/libnmmFFMpegEncodeNode.a lib/nmm/libnmmFFMpegEncodeNode.la lib/nmm/libnmmFFMpegEncodeNode.so lib/nmm/libnmmFFMpegEncodeNode.so.0 +lib/nmm/libnmmFramerateConverterNode.a lib/nmm/libnmmFramerateConverterNode.la lib/nmm/libnmmFramerateConverterNode.so lib/nmm/libnmmFramerateConverterNode.so.0 +lib/nmm/libnmmGenericReadNode.a lib/nmm/libnmmGenericReadNode.la lib/nmm/libnmmGenericReadNode.so lib/nmm/libnmmGenericReadNode.so.0 +lib/nmm/libnmmGenericWriteNode.a lib/nmm/libnmmGenericWriteNode.la lib/nmm/libnmmGenericWriteNode.so lib/nmm/libnmmGenericWriteNode.so.0 +lib/nmm/libnmmIdNode.a lib/nmm/libnmmIdNode.la lib/nmm/libnmmIdNode.so lib/nmm/libnmmIdNode.so.0 +lib/nmm/libnmmJPEGDecodeNode.a lib/nmm/libnmmJPEGDecodeNode.la lib/nmm/libnmmJPEGDecodeNode.so lib/nmm/libnmmJPEGDecodeNode.so.0 +lib/nmm/libnmmJPEGEncodeNode.a lib/nmm/libnmmJPEGEncodeNode.la lib/nmm/libnmmJPEGEncodeNode.so lib/nmm/libnmmJPEGEncodeNode.so.0 +lib/nmm/libnmmLogoNode.a lib/nmm/libnmmLogoNode.la lib/nmm/libnmmLogoNode.so lib/nmm/libnmmLogoNode.so.0 +lib/nmm/libnmmMP3ReadNode.a lib/nmm/libnmmMP3ReadNode.la lib/nmm/libnmmMP3ReadNode.so lib/nmm/libnmmMP3ReadNode.so.0 +lib/nmm/libnmmMPEGAudioDecodeNode.a lib/nmm/libnmmMPEGAudioDecodeNode.la lib/nmm/libnmmMPEGAudioDecodeNode.so lib/nmm/libnmmMPEGAudioDecodeNode.so.0 +lib/nmm/libnmmMPEGAudioEncodeNode.a lib/nmm/libnmmMPEGAudioEncodeNode.la lib/nmm/libnmmMPEGAudioEncodeNode.so lib/nmm/libnmmMPEGAudioEncodeNode.so.0 +lib/nmm/libnmmMPEGDemuxNode.a lib/nmm/libnmmMPEGDemuxNode.la lib/nmm/libnmmMPEGDemuxNode.so lib/nmm/libnmmMPEGDemuxNode.so.0 +lib/nmm/libnmmMPEGReadNode.a lib/nmm/libnmmMPEGReadNode.la lib/nmm/libnmmMPEGReadNode.so lib/nmm/libnmmMPEGReadNode.so.0 +lib/nmm/libnmmMPEGTimeShiftingNode.a lib/nmm/libnmmMPEGTimeShiftingNode.la lib/nmm/libnmmMPEGTimeShiftingNode.so lib/nmm/libnmmMPEGTimeShiftingNode.so.0 +lib/nmm/libnmmMPEGVSHDetectionNode.a lib/nmm/libnmmMPEGVSHDetectionNode.la lib/nmm/libnmmMPEGVSHDetectionNode.so lib/nmm/libnmmMPEGVSHDetectionNode.so.0 +lib/nmm/libnmmMPEGVideoDecodeNode.a lib/nmm/libnmmMPEGVideoDecodeNode.la lib/nmm/libnmmMPEGVideoDecodeNode.so lib/nmm/libnmmMPEGVideoDecodeNode.so.0 +lib/nmm/libnmmMagickManipulationNode.a lib/nmm/libnmmMagickManipulationNode.la lib/nmm/libnmmMagickManipulationNode.so lib/nmm/libnmmMagickManipulationNode.so.0 +lib/nmm/libnmmMagickReadNode.a lib/nmm/libnmmMagickReadNode.la lib/nmm/libnmmMagickReadNode.so lib/nmm/libnmmMagickReadNode.so.0 +lib/nmm/libnmmMagickWriteNode.a lib/nmm/libnmmMagickWriteNode.la lib/nmm/libnmmMagickWriteNode.so lib/nmm/libnmmMagickWriteNode.so.0 +lib/nmm/libnmmOSDManagerNode.a lib/nmm/libnmmOSDManagerNode.la lib/nmm/libnmmOSDManagerNode.so lib/nmm/libnmmOSDManagerNode.so.0 +lib/nmm/libnmmOverlayNode.a lib/nmm/libnmmOverlayNode.la lib/nmm/libnmmOverlayNode.so lib/nmm/libnmmOverlayNode.so.0 +lib/nmm/libnmmPCMDecodeNode.a lib/nmm/libnmmPCMDecodeNode.la lib/nmm/libnmmPCMDecodeNode.so lib/nmm/libnmmPCMDecodeNode.so.0 +lib/nmm/libnmmPCMEncodeNode.a lib/nmm/libnmmPCMEncodeNode.la lib/nmm/libnmmPCMEncodeNode.so lib/nmm/libnmmPCMEncodeNode.so.0 +lib/nmm/libnmmPNGReadNode.a lib/nmm/libnmmPNGReadNode.la lib/nmm/libnmmPNGReadNode.so lib/nmm/libnmmPNGReadNode.so.0 +lib/nmm/libnmmPNGWriteNode.a lib/nmm/libnmmPNGWriteNode.la lib/nmm/libnmmPNGWriteNode.so lib/nmm/libnmmPNGWriteNode.so.0 +lib/nmm/libnmmPlaybackNode.a lib/nmm/libnmmPlaybackNode.la lib/nmm/libnmmPlaybackNode.so lib/nmm/libnmmPlaybackNode.so.0 +lib/nmm/libnmmRGBtoRGBConverterNode.a lib/nmm/libnmmRGBtoRGBConverterNode.la lib/nmm/libnmmRGBtoRGBConverterNode.so lib/nmm/libnmmRGBtoRGBConverterNode.so.0 +lib/nmm/libnmmRGBtoYV12ConverterNode.a lib/nmm/libnmmRGBtoYV12ConverterNode.la lib/nmm/libnmmRGBtoYV12ConverterNode.so lib/nmm/libnmmRGBtoYV12ConverterNode.so.0 +lib/nmm/libnmmRawNode.a lib/nmm/libnmmRawNode.la lib/nmm/libnmmRawNode.so lib/nmm/libnmmRawNode.so.0 +lib/nmm/libnmmRecordNode.a lib/nmm/libnmmRecordNode.la lib/nmm/libnmmRecordNode.so lib/nmm/libnmmRecordNode.so.0 +lib/nmm/libnmmScopeNode.a lib/nmm/libnmmScopeNode.la lib/nmm/libnmmScopeNode.so lib/nmm/libnmmScopeNode.so.0 +lib/nmm/libnmmTimeDisplayNode.a lib/nmm/libnmmTimeDisplayNode.la lib/nmm/libnmmTimeDisplayNode.so lib/nmm/libnmmTimeDisplayNode.so.0 +lib/nmm/libnmmTimedBufferDropNode.a lib/nmm/libnmmTimedBufferDropNode.la lib/nmm/libnmmTimedBufferDropNode.so lib/nmm/libnmmTimedBufferDropNode.so.0 +lib/nmm/libnmmURLNode.a lib/nmm/libnmmURLNode.la lib/nmm/libnmmURLNode.so lib/nmm/libnmmURLNode.so.0 +lib/nmm/libnmmVideoCropNode.a lib/nmm/libnmmVideoCropNode.la lib/nmm/libnmmVideoCropNode.so lib/nmm/libnmmVideoCropNode.so.0 +lib/nmm/libnmmVideoGrabNode.a lib/nmm/libnmmVideoGrabNode.la lib/nmm/libnmmVideoGrabNode.so lib/nmm/libnmmVideoGrabNode.so.0 +lib/nmm/libnmmVideoMuxNode.a lib/nmm/libnmmVideoMuxNode.la lib/nmm/libnmmVideoMuxNode.so lib/nmm/libnmmVideoMuxNode.so.0 +lib/nmm/libnmmVideoScalerNode.a lib/nmm/libnmmVideoScalerNode.la lib/nmm/libnmmVideoScalerNode.so lib/nmm/libnmmVideoScalerNode.so.0 +lib/nmm/libnmmWavReadNode.a lib/nmm/libnmmWavReadNode.la lib/nmm/libnmmWavReadNode.so lib/nmm/libnmmWavReadNode.so.0 +lib/nmm/libnmmWavWriteNode.a lib/nmm/libnmmWavWriteNode.la lib/nmm/libnmmWavWriteNode.so lib/nmm/libnmmWavWriteNode.so.0 +lib/nmm/libnmmWhiteNoiseNode.a lib/nmm/libnmmWhiteNoiseNode.la lib/nmm/libnmmWhiteNoiseNode.so lib/nmm/libnmmWhiteNoiseNode.so.0 +lib/nmm/libnmmYUVDeInterlaceNode.a lib/nmm/libnmmYUVDeInterlaceNode.la lib/nmm/libnmmYUVDeInterlaceNode.so lib/nmm/libnmmYUVDeInterlaceNode.so.0 +lib/nmm/libnmmYUVtoRGBConverterNode.a lib/nmm/libnmmYUVtoRGBConverterNode.la lib/nmm/libnmmYUVtoRGBConverterNode.so lib/nmm/libnmmYUVtoRGBConverterNode.so.0 +lib/nmm/libnmmYUVtoYUVConverterNode.a lib/nmm/libnmmYUVtoYUVConverterNode.la lib/nmm/libnmmYUVtoYUVConverterNode.so lib/nmm/libnmmYUVtoYUVConverterNode.so.0 +lib/nmm/libnmmalsainterfaces.a lib/nmm/libnmmalsainterfaces.la lib/nmm/libnmmalsainterfaces.so lib/nmm/libnmmalsainterfaces.so.0 +lib/nmm/libnmmaudiointerfaces.a lib/nmm/libnmmaudiointerfaces.la lib/nmm/libnmmaudiointerfaces.so lib/nmm/libnmmaudiointerfaces.so.0 +lib/nmm/libnmmcomm.a lib/nmm/libnmmcomm.la lib/nmm/libnmmcomm.so lib/nmm/libnmmcomm.so.0 +lib/nmm/libnmmdisplayinterfaces.a lib/nmm/libnmmdisplayinterfaces.la lib/nmm/libnmmdisplayinterfaces.so lib/nmm/libnmmdisplayinterfaces.so.0 +lib/nmm/libnmmdvdinterfaces.a lib/nmm/libnmmdvdinterfaces.la lib/nmm/libnmmdvdinterfaces.so lib/nmm/libnmmdvdinterfaces.so.0 +lib/nmm/libnmmfileavilib.a lib/nmm/libnmmfileavilib.la lib/nmm/libnmmfileavilib.so lib/nmm/libnmmfileavilib.so.0 +lib/nmm/libnmmfileavimpdemux.a lib/nmm/libnmmfileavimpdemux.la lib/nmm/libnmmfileavimpdemux.so lib/nmm/libnmmfileavimpdemux.so.0 +lib/nmm/libnmmfileinterfaces.a lib/nmm/libnmmfileinterfaces.la lib/nmm/libnmmfileinterfaces.so lib/nmm/libnmmfileinterfaces.so.0 +lib/nmm/libnmmfileutils.a lib/nmm/libnmmfileutils.la lib/nmm/libnmmfileutils.so lib/nmm/libnmmfileutils.so.0 +lib/nmm/libnmmfork.a lib/nmm/libnmmfork.la lib/nmm/libnmmfork.so lib/nmm/libnmmfork.so.0 +lib/nmm/libnmmformat.a lib/nmm/libnmmformat.la lib/nmm/libnmmformat.so lib/nmm/libnmmformat.so.0 +lib/nmm/libnmmframecount.a lib/nmm/libnmmframecount.la lib/nmm/libnmmframecount.so lib/nmm/libnmmframecount.so.0 +lib/nmm/libnmmg711.a lib/nmm/libnmmg711.la lib/nmm/libnmmg711.so lib/nmm/libnmmg711.so.0 +lib/nmm/libnmmgdparse.a lib/nmm/libnmmgdparse.la lib/nmm/libnmmgdparse.so lib/nmm/libnmmgdparse.so.0 +lib/nmm/libnmmgraphbuilder.a lib/nmm/libnmmgraphbuilder.la lib/nmm/libnmmgraphbuilder.so lib/nmm/libnmmgraphbuilder.so.0 +lib/nmm/libnmmgraphurl.a lib/nmm/libnmmgraphurl.la lib/nmm/libnmmgraphurl.so lib/nmm/libnmmgraphurl.so.0 +lib/nmm/libnmmiAudioMuxIDL.a lib/nmm/libnmmiAudioMuxIDL.la lib/nmm/libnmmiAudioMuxIDL.so lib/nmm/libnmmiAudioMuxIDL.so.0 +lib/nmm/libnmmiCropIDL.a lib/nmm/libnmmiCropIDL.la lib/nmm/libnmmiCropIDL.so lib/nmm/libnmmiCropIDL.so.0 +lib/nmm/libnmmiMPEGDemuxNodeIDL.a lib/nmm/libnmmiMPEGDemuxNodeIDL.la lib/nmm/libnmmiMPEGDemuxNodeIDL.so lib/nmm/libnmmiMPEGDemuxNodeIDL.so.0 +lib/nmm/libnmmiScalerIDL.a lib/nmm/libnmmiScalerIDL.la lib/nmm/libnmmiScalerIDL.so lib/nmm/libnmmiScalerIDL.so.0 +lib/nmm/libnmmiTimeshifting.a lib/nmm/libnmmiTimeshifting.la lib/nmm/libnmmiTimeshifting.so lib/nmm/libnmmiTimeshifting.so.0 +lib/nmm/libnmmiVideoMuxIDL.a lib/nmm/libnmmiVideoMuxIDL.la lib/nmm/libnmmiVideoMuxIDL.so lib/nmm/libnmmiVideoMuxIDL.so.0 +lib/nmm/libnmmiaudiovisualization.a lib/nmm/libnmmiaudiovisualization.la lib/nmm/libnmmiaudiovisualization.so lib/nmm/libnmmiaudiovisualization.so.0 +lib/nmm/libnmmicamera.a lib/nmm/libnmmicamera.la lib/nmm/libnmmicamera.so lib/nmm/libnmmicamera.so.0 +lib/nmm/libnmmicdda.a lib/nmm/libnmmicdda.la lib/nmm/libnmmicdda.so lib/nmm/libnmmicdda.so.0 +lib/nmm/libnmmicecastinterfaces.a lib/nmm/libnmmicecastinterfaces.la lib/nmm/libnmmicecastinterfaces.so lib/nmm/libnmmicecastinterfaces.so.0 +lib/nmm/libnmmifilter.a lib/nmm/libnmmifilter.la lib/nmm/libnmmifilter.so lib/nmm/libnmmifilter.so.0 +lib/nmm/libnmminterpolator.a lib/nmm/libnmminterpolator.la lib/nmm/libnmminterpolator.so lib/nmm/libnmminterpolator.so.0 +lib/nmm/libnmmipng.a lib/nmm/libnmmipng.la lib/nmm/libnmmipng.so lib/nmm/libnmmipng.so.0 +lib/nmm/libnmmistats.a lib/nmm/libnmmistats.la lib/nmm/libnmmistats.so lib/nmm/libnmmistats.so.0 +lib/nmm/libnmmiurl.a lib/nmm/libnmmiurl.la lib/nmm/libnmmiurl.so lib/nmm/libnmmiurl.so.0 +lib/nmm/libnmmivideomagick.a lib/nmm/libnmmivideomagick.la lib/nmm/libnmmivideomagick.so lib/nmm/libnmmivideomagick.so.0 +lib/nmm/libnmmiviscacamera.a lib/nmm/libnmmiviscacamera.la lib/nmm/libnmmiviscacamera.so lib/nmm/libnmmiviscacamera.so.0 +lib/nmm/libnmmmessaging.a lib/nmm/libnmmmessaging.la lib/nmm/libnmmmessaging.so lib/nmm/libnmmmessaging.so.0 +lib/nmm/libnmmmultimedia.a lib/nmm/libnmmmultimedia.la lib/nmm/libnmmmultimedia.so lib/nmm/libnmmmultimedia.so.0 +lib/nmm/libnmmmultimediainterfaces.a lib/nmm/libnmmmultimediainterfaces.la lib/nmm/libnmmmultimediainterfaces.so lib/nmm/libnmmmultimediainterfaces.so.0 +lib/nmm/libnmmnet.a lib/nmm/libnmmnet.la lib/nmm/libnmmnet.so lib/nmm/libnmmnet.so.0 +lib/nmm/libnmmnetinterfaces.a lib/nmm/libnmmnetinterfaces.la lib/nmm/libnmmnetinterfaces.so lib/nmm/libnmmnetinterfaces.so.0 +lib/nmm/libnmmnetstrategy.a lib/nmm/libnmmnetstrategy.la lib/nmm/libnmmnetstrategy.so lib/nmm/libnmmnetstrategy.so.0 +lib/nmm/libnmmosdmanagerinterfaces.a lib/nmm/libnmmosdmanagerinterfaces.la lib/nmm/libnmmosdmanagerinterfaces.so lib/nmm/libnmmosdmanagerinterfaces.so.0 +lib/nmm/libnmmoverlay.a lib/nmm/libnmmoverlay.la lib/nmm/libnmmoverlay.so lib/nmm/libnmmoverlay.so.0 +lib/nmm/libnmmpluginsinterfaces.a lib/nmm/libnmmpluginsinterfaces.la lib/nmm/libnmmpluginsinterfaces.so lib/nmm/libnmmpluginsinterfaces.so.0 +lib/nmm/libnmmpngutils.a lib/nmm/libnmmpngutils.la lib/nmm/libnmmpngutils.so lib/nmm/libnmmpngutils.so.0 +lib/nmm/libnmmproc.a lib/nmm/libnmmproc.la lib/nmm/libnmmproc.so lib/nmm/libnmmproc.so.0 +lib/nmm/libnmmregistry.a lib/nmm/libnmmregistry.la lib/nmm/libnmmregistry.so lib/nmm/libnmmregistry.so.0 +lib/nmm/libnmmscaler.a lib/nmm/libnmmscaler.la lib/nmm/libnmmscaler.so lib/nmm/libnmmscaler.so.0 +lib/nmm/libnmmserialize.a lib/nmm/libnmmserialize.la lib/nmm/libnmmserialize.so lib/nmm/libnmmserialize.so.0 +lib/nmm/libnmmsync.a lib/nmm/libnmmsync.la lib/nmm/libnmmsync.so lib/nmm/libnmmsync.so.0 +lib/nmm/libnmmsyncinterfaces.a lib/nmm/libnmmsyncinterfaces.la lib/nmm/libnmmsyncinterfaces.so lib/nmm/libnmmsyncinterfaces.so.0 +lib/nmm/libnmmthread.a lib/nmm/libnmmthread.la lib/nmm/libnmmthread.so lib/nmm/libnmmthread.so.0 +lib/nmm/libnmmtime.a lib/nmm/libnmmtime.la lib/nmm/libnmmtime.so lib/nmm/libnmmtime.so.0 +lib/nmm/libnmmtimer.a lib/nmm/libnmmtimer.la lib/nmm/libnmmtimer.so lib/nmm/libnmmtimer.so.0 +lib/nmm/libnmmtvguideinterfaces.a lib/nmm/libnmmtvguideinterfaces.la lib/nmm/libnmmtvguideinterfaces.so lib/nmm/libnmmtvguideinterfaces.so.0 +lib/nmm/libnmmtvmanagerinterfaces.a lib/nmm/libnmmtvmanagerinterfaces.la lib/nmm/libnmmtvmanagerinterfaces.so lib/nmm/libnmmtvmanagerinterfaces.so.0 +lib/nmm/libnmmutils.a lib/nmm/libnmmutils.la lib/nmm/libnmmutils.so lib/nmm/libnmmutils.so.0 diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile index 2031ab83cec0..eecdc364c5cd 100644 --- a/multimedia/noatun-plugins/Makefile +++ b/multimedia/noatun-plugins/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 USE_BZIP2= yes PREFIX= ${KDE_PREFIX} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_SDL= sdl diff --git a/multimedia/ogle-gui/Makefile b/multimedia/ogle-gui/Makefile index 97654c953ec7..6b2de4519de1 100644 --- a/multimedia/ogle-gui/Makefile +++ b/multimedia/ogle-gui/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomehack \ gtk20 WANT_GNOME= yes USE_XORG= xpm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --with-dvd-includes=${LOCALBASE}/include \ --with-dvdcontrol=${LOCALBASE} \ diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 1ecfcfd9b126..a0be41dc52a2 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ mad.2:${PORTSDIR}/audio/libmad \ xml2.5:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_XORG= x11 xext sm USE_SUBMAKE= yes USE_GMAKE= yes diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile index 4a2244bab886..bd3135c5afaf 100644 --- a/multimedia/ogmrip/Makefile +++ b/multimedia/ogmrip/Makefile @@ -38,7 +38,7 @@ OPTIONS= GUI "Build the GTK+ GUI" on \ USE_GNOME= glib20 gnomehack libxml2 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_path_EJECT_PROG="/usr/sbin/cdcontrol" diff --git a/multimedia/okle/Makefile b/multimedia/okle/Makefile index 7a221c4a9658..69f5dbaf1487 100644 --- a/multimedia/okle/Makefile +++ b/multimedia/okle/Makefile @@ -17,7 +17,7 @@ COMMENT= A KDE frontend to the Ogle DVD player BUILD_DEPENDS= ${LOCALBASE}/lib/ogle/libdvdcontrol.so.11:${PORTSDIR}/multimedia/ogle RUN_DEPENDS= ogle:${PORTSDIR}/multimedia/ogle -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_KDELIBS_VER=3 CONFIGURE_ARGS= --with-ogle-dir=${LOCALBASE}/bin \ --with-ogle-includes=${LOCALBASE}/include \ diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile index f5be666ab147..3cb245f50888 100644 --- a/multimedia/smpeg-xmms/Makefile +++ b/multimedia/smpeg-xmms/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg \ USE_GNOME= gnomehack gtk12 USE_SDL= sdl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile index 81d4d0d0fc8d..eb1ed595b1f2 100644 --- a/multimedia/smpeg/Makefile +++ b/multimedia/smpeg/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= distfiles MAINTAINER= acm@FreeBSD.org COMMENT= A free MPEG1 video player library with sound support -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WANT_GNOME= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/multimedia/subtitlecomposer/Makefile b/multimedia/subtitlecomposer/Makefile index adbabcf8d519..b188651a5cc5 100644 --- a/multimedia/subtitlecomposer/Makefile +++ b/multimedia/subtitlecomposer/Makefile @@ -16,7 +16,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Subtitle editor for KDE USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER=3 USE_XORG= xext GNU_CONFIGURE= yes diff --git a/multimedia/totem-pl-parser/Makefile b/multimedia/totem-pl-parser/Makefile index 79dac51e0445..9ce23850de4f 100644 --- a/multimedia/totem-pl-parser/Makefile +++ b/multimedia/totem-pl-parser/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gnomehack gnomeprefix gnomevfs2 intlhack evolutiondataserver \ ltverhack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile index abb25a527b47..c1b985261cf8 100644 --- a/multimedia/totem/Makefile +++ b/multimedia/totem/Makefile @@ -32,7 +32,7 @@ GNOME_DESKTOP_VERSION=2 WANT_GSTREAMER= yes INSTALLS_ICONS= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_OMF= yes PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 679811de046e..fbed082e3c84 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes WANT_SDL= yes WANT_GNOME= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-isystem /usr/include -isystem ${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ SDL_CONFIG="${SDL_CONFIG}" diff --git a/multimedia/transkode/Makefile b/multimedia/transkode/Makefile index c9ae8d69fc6d..fc0ac17f0422 100644 --- a/multimedia/transkode/Makefile +++ b/multimedia/transkode/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PERL5= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/multimedia/vcdimager/Makefile b/multimedia/vcdimager/Makefile index dc65359dbbdc..32dbdbf41769 100644 --- a/multimedia/vcdimager/Makefile +++ b/multimedia/vcdimager/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ xml2:${PORTSDIR}/textproc/libxml2 \ cdio.8:${PORTSDIR}/sysutils/libcdio -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_GMAKE= yes diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile index ddbfe72d7159..ae549cee3ae1 100644 --- a/multimedia/xine_artsplugin/Makefile +++ b/multimedia/xine_artsplugin/Makefile @@ -26,7 +26,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdemultimedia-${PORTVERSION} USE_LDCONFIG= yes diff --git a/multimedia/xmms-status-plugin/Makefile b/multimedia/xmms-status-plugin/Makefile index e725a44c5d43..99f7bb6c03f9 100644 --- a/multimedia/xmms-status-plugin/Makefile +++ b/multimedia/xmms-status-plugin/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms USE_XORG= x11 xpm USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile index 8290573cb24a..e0d1748c9b0d 100644 --- a/multimedia/xmms/Makefile +++ b/multimedia/xmms/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GETTEXT= yes USE_ICONV= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile index 23c0ed0207e0..e34e24ad5ad2 100644 --- a/multimedia/xtheater/Makefile +++ b/multimedia/xtheater/Makefile @@ -19,7 +19,7 @@ COMMENT= MPEG-1 player in GTK+ capable of playing MPEG-1 format streams LIB_DEPENDS= smpeg.1:${PORTSDIR}/multimedia/smpeg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_BZIP2= yes USE_GNOME= gtk12 diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile index 5b4e2ec794fc..2ab98acdcf65 100644 --- a/net-im/ayttm/Makefile +++ b/net-im/ayttm/Makefile @@ -7,7 +7,7 @@ PORTNAME= ayttm PORTVERSION= 0.5.0.82 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} @@ -30,7 +30,7 @@ USE_XORG= xpm xscrnsaver USE_GNOME= gnometarget gtk20 USE_OPENSSL= yes USE_GMAKE= yes -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-oscar --disable-workwizu --enable-smtp --enable-lj diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile index dc42c48614d0..1d250a460ce1 100644 --- a/net-im/empathy/Makefile +++ b/net-im/empathy/Makefile @@ -30,7 +30,7 @@ USE_LDCONFIG= yes USE_GNOME= evolutiondataserver gnomehack gnomeprefix pygtk2 ltverhack \ gnomepanel USE_GSTREAMER= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes INSTALLS_ICONS= yes USE_PYTHON= yes diff --git a/net-im/eva/Makefile b/net-im/eva/Makefile index 62e7cc172a9c..3b5d8d03a01f 100644 --- a/net-im/eva/Makefile +++ b/net-im/eva/Makefile @@ -20,7 +20,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= QQ IM Client for KDE3 USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 autoconf:262 +USE_AUTOTOOLS= libtool:22 autoconf:262 USE_GMAKE= yes USE_BZIP2= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile index ef303931b819..62a6860f0590 100644 --- a/net-im/farsight2/Makefile +++ b/net-im/farsight2/Makefile @@ -21,7 +21,7 @@ USE_PYTHON= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget \ pygtk2 USE_GSTREAMER= core good bad python -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile index d5b6069402e3..ebf6a4ad0e59 100644 --- a/net-im/gale/Makefile +++ b/net-im/gale/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= wwwcore.1:${PORTSDIR}/www/libwww \ USE_ICONV= yes USE_GNOME= glib12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure liboop/configure USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/net-im/gloox/Makefile b/net-im/gloox/Makefile index 24ece8ff8c3e..834b2265a499 100644 --- a/net-im/gloox/Makefile +++ b/net-im/gloox/Makefile @@ -17,7 +17,7 @@ COMMENT= Jabber/XMPP client library LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn \ gnutls.26:${PORTSDIR}/security/gnutls -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnomehack GNU_CONFIGURE= yes diff --git a/net-im/gnome-jabber/Makefile b/net-im/gnome-jabber/Makefile index 7de158d9fde9..8d4baf548aeb 100644 --- a/net-im/gnome-jabber/Makefile +++ b/net-im/gnome-jabber/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gnet-2.0.0:${PORTSDIR}/net/gnet2 USE_GMAKE= yes USE_GNOME= gnomeprefix intlhack gnomehack libgnomeui USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile index eafaf26630d6..a6aaa02ec227 100644 --- a/net-im/ickle/Makefile +++ b/net-im/ickle/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \ USE_GNOME= gtk12 WANT_GNOME= yes USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-sigc-prefix=${LOCALBASE} \ --with-gtkmm-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="`${LOCALBASE}/bin/sigc-config --cflags`" diff --git a/net-im/icqlib/Makefile b/net-im/icqlib/Makefile index 1c2fd072ce35..9684e799eb9c 100644 --- a/net-im/icqlib/Makefile +++ b/net-im/icqlib/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A library required by kicq (not libicq) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index 4dd4aa18c2cc..da8475fdf5c7 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -33,7 +33,7 @@ USE_RC_SUBR= jabber USE_ICONV= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= ${PREFIX}/lib/jabber .if !defined(NO_INSTALL_MANPAGES) diff --git a/net-im/kmerlin/Makefile b/net-im/kmerlin/Makefile index c1013d7e2b58..5a5e33684ce3 100644 --- a/net-im/kmerlin/Makefile +++ b/net-im/kmerlin/Makefile @@ -18,7 +18,7 @@ COMMENT= An IM (Instant Messenger) KDE client for the Microsoft MSN Network USE_XORG= xscrnsaver USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS+= --prefix=${LOCALBASE} diff --git a/net-im/kmess-kde4/Makefile b/net-im/kmess-kde4/Makefile index ba694ed9292c..72b194c5d52b 100644 --- a/net-im/kmess-kde4/Makefile +++ b/net-im/kmess-kde4/Makefile @@ -17,7 +17,7 @@ MAINTAINER= freebsd-ports@club-internet.fr COMMENT= MSN Messenger Client for KDE3 USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/net-im/kmess/Makefile b/net-im/kmess/Makefile index ba694ed9292c..72b194c5d52b 100644 --- a/net-im/kmess/Makefile +++ b/net-im/kmess/Makefile @@ -17,7 +17,7 @@ MAINTAINER= freebsd-ports@club-internet.fr COMMENT= MSN Messenger Client for KDE3 USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/net-im/konverse/Makefile b/net-im/konverse/Makefile index 2aaf3fc0ca78..5e0fc366f90b 100644 --- a/net-im/konverse/Makefile +++ b/net-im/konverse/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= KDE Jabber Client USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS+=--with-extra-includes=${LOCALBASE}/include \ diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index 9e9bb29b5e38..bbf92864ba38 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -32,7 +32,7 @@ USE_BZIP2= yes USE_GNOME= glib20 USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \ diff --git a/net-im/kpopup/Makefile b/net-im/kpopup/Makefile index c96a6ce408ac..ae00cd252958 100644 --- a/net-im/kpopup/Makefile +++ b/net-im/kpopup/Makefile @@ -23,7 +23,7 @@ SUB_FILES= pkg-message USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes KPOPUP_DIR= /var/tmp/kpopup diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile index 19500c0889e2..a840d03b6621 100644 --- a/net-im/libicq/Makefile +++ b/net-im/libicq/Makefile @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library to add ICQ communication support to your software USE_GNOME= glib12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/net-im/libicq2000/Makefile b/net-im/libicq2000/Makefile index bba48f54d883..a874d802e0f7 100644 --- a/net-im/libicq2000/Makefile +++ b/net-im/libicq2000/Makefile @@ -17,7 +17,7 @@ COMMENT= An opensource C++ library to support icq2000/2001 protocol LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-static USE_LDCONFIG= yes diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile index ebd74b052957..a87295d3b288 100644 --- a/net-im/libjingle/Makefile +++ b/net-im/libjingle/Makefile @@ -27,7 +27,7 @@ CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \ USE_GNOME= glib20 USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_DOS2UNIX= README USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net-im/libnice/Makefile b/net-im/libnice/Makefile index 62cfaf2f9c65..dad244fece7b 100644 --- a/net-im/libnice/Makefile +++ b/net-im/libnice/Makefile @@ -17,7 +17,7 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget USE_GSTREAMER= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_GETIFADDRS" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile index 362824aeb1b2..5381e6b6e150 100644 --- a/net-im/libtelepathy/Makefile +++ b/net-im/libtelepathy/Makefile @@ -25,6 +25,6 @@ RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} USE_GMAKE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/net-im/libyahoo2/Makefile b/net-im/libyahoo2/Makefile index 10cf8012750f..6ddb077c23f9 100644 --- a/net-im/libyahoo2/Makefile +++ b/net-im/libyahoo2/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= chinsan@FreeBSD.org COMMENT= A C library that handles the new Yahoo! Messenger protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= glib20 gnomehack gnometarget GNU_CONFIGURE= yes diff --git a/net-im/loudmouth/Makefile b/net-im/loudmouth/Makefile index 6d43e13581a8..a97ee056775c 100644 --- a/net-im/loudmouth/Makefile +++ b/net-im/loudmouth/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 ltverhack CONFIGURE_ARGS= --disable-gtk-doc diff --git a/net-im/meanwhile/Makefile b/net-im/meanwhile/Makefile index 49d64991dfdb..4f6ab1b8adf4 100644 --- a/net-im/meanwhile/Makefile +++ b/net-im/meanwhile/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= marcus@FreeBSD.org COMMENT= Open Source implementation of the Lotus Sametime protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes diff --git a/net-im/meanwhile/files/patch-libtool22 b/net-im/meanwhile/files/patch-libtool22 new file mode 100644 index 000000000000..fab3b805a353 --- /dev/null +++ b/net-im/meanwhile/files/patch-libtool22 @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig 2009-07-18 16:57:46.000000000 -0500 ++++ src/Makefile.in 2009-07-18 16:58:05.000000000 -0500 +@@ -236,7 +236,6 @@ + $(DEBUG_CFLAGS) $(GLIB_CFLAGS) + + libmeanwhile_la_LDFLAGS = \ +- @MW_SO_OS_FLAGS@ \ + -version-info @MW_SO_VERSION@ + + libmeanwhile_la_SOURCES = \ diff --git a/net-im/sim-im-devel/Makefile b/net-im/sim-im-devel/Makefile index 5e75322e8f7b..6032e67f6531 100644 --- a/net-im/sim-im-devel/Makefile +++ b/net-im/sim-im-devel/Makefile @@ -21,7 +21,7 @@ CONFLICTS= simicq-[0-9]* sim-im-[0-9]* USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_QT_VER= 3 USE_XORG= x11 xext xscrnsaver USE_OPENSSL= yes diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile index 69cecd3b8b20..df7c8aa67ffe 100644 --- a/net-im/sim-im/Makefile +++ b/net-im/sim-im/Makefile @@ -28,7 +28,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_QT_VER= 3 USE_PERL5_BUILD=yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes USE_LDCONFIG= yes USE_GETTEXT= yes diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile index 5f2551c259dc..214b2f6287f0 100644 --- a/net-im/telepathy-glib/Makefile +++ b/net-im/telepathy-glib/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt BUILD_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} RUN_DEPENDS+= ${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes USE_GNOME= gnomehack pkgconfig glib20 ltverhack diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile index 7eb29315e2ec..877c3e91c06b 100644 --- a/net-im/telepathy-mission-control/Makefile +++ b/net-im/telepathy-mission-control/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= telepathy.2:${PORTSDIR}/net-im/libtelepathy \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib USE_GNOME= gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/net-mgmt/bsnmp-ucd/Makefile b/net-mgmt/bsnmp-ucd/Makefile index 251e293a5e3f..3c5a339fde2d 100644 --- a/net-mgmt/bsnmp-ucd/Makefile +++ b/net-mgmt/bsnmp-ucd/Makefile @@ -14,7 +14,7 @@ MAINTAINER= to.my.trociny@gmail.com COMMENT= A bsnmpd module that implements parts of UCD-SNMP-MIB USE_MAKE= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env MAN8= bsnmp-ucd.8 diff --git a/net-mgmt/cacti-spine/Makefile b/net-mgmt/cacti-spine/Makefile index 30e71db5f8db..fdc520046cc1 100644 --- a/net-mgmt/cacti-spine/Makefile +++ b/net-mgmt/cacti-spine/Makefile @@ -21,19 +21,19 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+=--with-mysql=${LOCALBASE} --with-snmp=${LOCALBASE} USE_MYSQL= YES USE_OPENSSL= YES -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: -.for file in config.guess config.sub ltmain.sh - @${LN} -fs ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}/config/${file} -.endfor - @${LN} -fs ${LIBTOOL} ${WRKSRC}/libtool @${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h +pre-configure: + @(cd ${WRKSRC} ; ${LIBTOOLIZE} --copy --force --install) + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/spine ${PREFIX}/bin @${MKDIR} ${EXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/spine.conf ${EXAMPLESDIR} @[ -e ${PREFIX}/etc/spine.conf ] || \ ${INSTALL_DATA} ${EXAMPLESDIR}/spine.conf ${PREFIX}/etc/ + .include <bsd.port.mk> diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile index 5b6ccd645745..97f93a9c46bf 100644 --- a/net-mgmt/cflowd/Makefile +++ b/net-mgmt/cflowd/Makefile @@ -18,7 +18,7 @@ COMMENT= Flow analysis tool used for analyzing Cisco's NetFlow switching LIB_DEPENDS= Arts.0:${PORTSDIR}/net-mgmt/arts++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile index 4b984175ca5a..788a73d65f80 100644 --- a/net-mgmt/ettercap/Makefile +++ b/net-mgmt/ettercap/Makefile @@ -8,7 +8,7 @@ PORTNAME= ettercap PORTVERSION= 0.7.3 DISTVERSIONPREFIX= NG- -PORTREVISION= 7 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= net-mgmt security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} \ @@ -27,7 +27,7 @@ OPTIONS= GTK "Build with GTK2+ GUI" on \ PCRE "Build with PCRE regexps in filters" on WANT_GNOME= yes -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 GNU_CONFIGURE= yes MAN5= etter.conf.5 diff --git a/net-mgmt/libsmi/Makefile b/net-mgmt/libsmi/Makefile index 6b06187de13b..ce467556fdb4 100644 --- a/net-mgmt/libsmi/Makefile +++ b/net-mgmt/libsmi/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.ibr.cs.tu-bs.de/pub/local/libsmi/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A library to access SMI MIB information -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= pkgconfig gnomehack USE_GMAKE= yes diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile index 860166febe58..9e6bde75ea71 100644 --- a/net-mgmt/nagios-devel/Makefile +++ b/net-mgmt/nagios-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= nagios PORTVERSION= 3.1.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -22,7 +23,7 @@ LATEST_LINK= nagios-devel USE_ICONV= yes USE_PERL5_BUILD= yes USE_PHP= yes -USE_AUTOTOOLS= autoconf:262 libltdl:15 +USE_AUTOTOOLS= autoconf:262 libltdl:22 USE_RC_SUBR= nagios.sh CONFLICTS= nagios-[123].* diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile index bf38e0590503..a1f06866bb41 100644 --- a/net-mgmt/nagios/Makefile +++ b/net-mgmt/nagios/Makefile @@ -7,7 +7,7 @@ PORTNAME= nagios PORTVERSION= 3.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio USE_ICONV= yes USE_PERL5_BUILD= yes -USE_AUTOTOOLS= autoconf:262 libltdl:15 +USE_AUTOTOOLS= autoconf:262 libltdl:22 USE_RC_SUBR= nagios CONFLICTS= nagios-[12].* nagios-devel-* diff --git a/net-mgmt/nagios2/Makefile b/net-mgmt/nagios2/Makefile index 9fa9d824f634..06c9abeff5ea 100644 --- a/net-mgmt/nagios2/Makefile +++ b/net-mgmt/nagios2/Makefile @@ -7,7 +7,7 @@ PORTNAME= nagios PORTVERSION= 2.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-mgmt MASTER_SITES= SF @@ -19,7 +19,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio USE_ICONV= yes USE_PERL5_BUILD= yes -USE_AUTOTOOLS= autoconf:262 libltdl:15 +USE_AUTOTOOLS= autoconf:262 libltdl:22 USE_RC_SUBR= nagios CONFLICTS= nagios-[13].* nagios-devel-* diff --git a/net-mgmt/py-yapsnmp/Makefile b/net-mgmt/py-yapsnmp/Makefile index 06a650b00667..430123d3ca1e 100644 --- a/net-mgmt/py-yapsnmp/Makefile +++ b/net-mgmt/py-yapsnmp/Makefile @@ -17,7 +17,7 @@ COMMENT= Python SNMP module based on net-snmp LIB_DEPENDS= netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_PYTHON= yes GNU_CONFIGURE= yes diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile index e5fa93988cf7..49e1334c6946 100644 --- a/net-mgmt/tork/Makefile +++ b/net-mgmt/tork/Makefile @@ -16,7 +16,7 @@ COMMENT= TorK is an Anonymity Manager for the KDE Desktop USE_GMAKE= yes USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 aclocal:19 +USE_AUTOTOOLS= libtool:22 aclocal:19 USE_GETTEXT= yes USE_XORG= xext USE_LDCONFIG= yes diff --git a/net-p2p/apollon/Makefile b/net-p2p/apollon/Makefile index f249d70315d8..eff2373b10ed 100644 --- a/net-p2p/apollon/Makefile +++ b/net-p2p/apollon/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/net-p2p/cdonkey/Makefile b/net-p2p/cdonkey/Makefile index 7cfbf6c414be..1d44eb0d8782 100644 --- a/net-p2p/cdonkey/Makefile +++ b/net-p2p/cdonkey/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3 PLIST_FILES= bin/cDonkey USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-berkeley-db="${LOCALBASE}/include/db3:${LOCALBASE}/lib" USE_GMAKE= yes WRKSRC= ${WRKDIR}/cDonkey-${PORTVERSION} diff --git a/net-p2p/gift-fasttrack/Makefile b/net-p2p/gift-fasttrack/Makefile index 63530868a3cc..4901d3b13451 100644 --- a/net-p2p/gift-fasttrack/Makefile +++ b/net-p2p/gift-fasttrack/Makefile @@ -16,7 +16,7 @@ COMMENT= A FastTrack plugin for giFT LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig diff --git a/net-p2p/gift-openft/Makefile b/net-p2p/gift-openft/Makefile index cbbc27aab225..c5c0ec70b5fa 100644 --- a/net-p2p/gift-openft/Makefile +++ b/net-p2p/gift-openft/Makefile @@ -18,7 +18,7 @@ COMMENT= An OpenFT plugin for giFT LIB_DEPENDS= gift.0:${PORTSDIR}/net-p2p/gift \ db3.3:${PORTSDIR}/databases/db3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-p2p/gift/Makefile b/net-p2p/gift/Makefile index 8e74a4bac5b3..d97fa3c1c10e 100644 --- a/net-p2p/gift/Makefile +++ b/net-p2p/gift/Makefile @@ -7,7 +7,7 @@ PORTNAME= giFT PORTVERSION= 0.11.8.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= net-p2p MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME:L} @@ -18,7 +18,7 @@ COMMENT= An OpenFT, Gnutella and FastTrack p2p network client LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index b363ee3ca002..4c875d8fd321 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnunet PORTVERSION= 0.6.6b -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-p2p ipv6 MASTER_SITES= http://www.ovmj.org/GNUnet/download/ \ ${MASTER_SITE_GNU} @@ -20,7 +20,7 @@ COMMENT= An anonymous, distributed, reputation-based network LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4 -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GETTEXT= yes diff --git a/net-p2p/kmldonkey/Makefile b/net-p2p/kmldonkey/Makefile index 52e39d54026c..b2ca9fb0c414 100644 --- a/net-p2p/kmldonkey/Makefile +++ b/net-p2p/kmldonkey/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE integration for MLDonkey eDonkey P2P client USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --program-transform-name='' USE_LDCONFIG= yes INSTALLS_ICONS= yes diff --git a/net-p2p/ktorrent-devel/Makefile b/net-p2p/ktorrent-devel/Makefile index 23fcb1b0d2bd..698b9af8700f 100644 --- a/net-p2p/ktorrent-devel/Makefile +++ b/net-p2p/ktorrent-devel/Makefile @@ -21,7 +21,7 @@ CONFLICTS= ktorrent-[0.9]* USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/net-p2p/ktorrent2/Makefile b/net-p2p/ktorrent2/Makefile index 95891393c8c3..24a88f494adf 100644 --- a/net-p2p/ktorrent2/Makefile +++ b/net-p2p/ktorrent2/Makefile @@ -22,7 +22,7 @@ LATEST_LINK= ${PORTNAME}2 USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/net-p2p/libtorrent-rasterbar-14/Makefile b/net-p2p/libtorrent-rasterbar-14/Makefile index 927b56cb4ab1..3d914ad6469d 100644 --- a/net-p2p/libtorrent-rasterbar-14/Makefile +++ b/net-p2p/libtorrent-rasterbar-14/Makefile @@ -22,7 +22,7 @@ CONFLICTS= rblibtorrent-[0-9]* USE_GNOME= gnomehack USE_OPENSSL= yes -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I m4 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug \ diff --git a/net-p2p/libtorrent/Makefile b/net-p2p/libtorrent/Makefile index 91a90fdcf6a5..e96a386a6d6f 100644 --- a/net-p2p/libtorrent/Makefile +++ b/net-p2p/libtorrent/Makefile @@ -22,7 +22,7 @@ CONFLICTS?= libtorrent-devel-[0-9]* \ rblibtorrent-[0-9]* \ rblibtorrent-devel-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gnomehack USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/net-p2p/rblibtorrent-devel/Makefile b/net-p2p/rblibtorrent-devel/Makefile index 927b56cb4ab1..3d914ad6469d 100644 --- a/net-p2p/rblibtorrent-devel/Makefile +++ b/net-p2p/rblibtorrent-devel/Makefile @@ -22,7 +22,7 @@ CONFLICTS= rblibtorrent-[0-9]* USE_GNOME= gnomehack USE_OPENSSL= yes -USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I m4 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-debug \ diff --git a/net-p2p/verlihub/Makefile b/net-p2p/verlihub/Makefile index 47d7354c79b5..bbc203b27d92 100644 --- a/net-p2p/verlihub/Makefile +++ b/net-p2p/verlihub/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash USE_RC_SUBR= verlihub -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net-p2p/verlihub/pkg-plist b/net-p2p/verlihub/pkg-plist index 7293611fe5f1..9f4a5892f46b 100644 --- a/net-p2p/verlihub/pkg-plist +++ b/net-p2p/verlihub/pkg-plist @@ -97,7 +97,6 @@ lib/libverlihub.a lib/libverlihub.la lib/libverlihub.so lib/libverlihub.so.0 -lib/libvhapi.a lib/libvhapi.la lib/libvhapi.so lib/libvhapi.so.0 diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index 06cdc648f763..176751c4196f 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -14,7 +14,7 @@ MAINTAINER= dhn@FreeBSD.org COMMENT= Find the country that any IP address or hostname originates from USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= geoiplookup.1 geoipupdate.1 geoiplookup6.1 diff --git a/net/asterisk-addons/Makefile b/net/asterisk-addons/Makefile index df92efbe7b36..f796fb12e599 100644 --- a/net/asterisk-addons/Makefile +++ b/net/asterisk-addons/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off ONLY_FOR_ARCHS= i386 amd64 powerpc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 44219281de78..4ba1c733f20b 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.4.25 -#PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc PLIST_SUB+= WITH_ODBC="" CONFIGURE_ARGS+= --with-odbc --with-ltdl LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.4:${PORTSDIR}/devel/libltdl15 + ltdl.7:${PORTSDIR}/devel/libltdl22 .endif .if !defined(WITH_FREETDS) diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 44219281de78..4ba1c733f20b 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.4.25 -#PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc PLIST_SUB+= WITH_ODBC="" CONFIGURE_ARGS+= --with-odbc --with-ltdl LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.4:${PORTSDIR}/devel/libltdl15 + ltdl.7:${PORTSDIR}/devel/libltdl22 .endif .if !defined(WITH_FREETDS) diff --git a/net/asterisk14-addons/Makefile b/net/asterisk14-addons/Makefile index df92efbe7b36..f796fb12e599 100644 --- a/net/asterisk14-addons/Makefile +++ b/net/asterisk14-addons/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off ONLY_FOR_ARCHS= i386 amd64 powerpc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 44219281de78..4ba1c733f20b 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.4.25 -#PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -97,7 +97,7 @@ CONFIGURE_ARGS+= --without-odbc PLIST_SUB+= WITH_ODBC="" CONFIGURE_ARGS+= --with-odbc --with-ltdl LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.4:${PORTSDIR}/devel/libltdl15 + ltdl.7:${PORTSDIR}/devel/libltdl22 .endif .if !defined(WITH_FREETDS) diff --git a/net/asterisk16-addons/Makefile b/net/asterisk16-addons/Makefile index 42d78f7e3f5c..f4a75764b8fc 100644 --- a/net/asterisk16-addons/Makefile +++ b/net/asterisk16-addons/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16 OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off ONLY_FOR_ARCHS= i386 amd64 powerpc -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_MYSQL= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 1fc93a64351b..9dfb4ca9eae5 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -7,7 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.6.0.9 -PORTREVISION= 1 +PORTREVISION= 3 PKGNAMESUFFIX= 16 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ @@ -98,7 +98,7 @@ CONFIGURE_ARGS+= --without-odbc PLIST_SUB+= WITH_ODBC="" CONFIGURE_ARGS+= --with-odbc --with-ltdl LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \ - ltdl.4:${PORTSDIR}/devel/libltdl15 + ltdl.7:${PORTSDIR}/devel/libltdl22 .endif .if !defined(WITH_FREETDS) diff --git a/net/atmsupport/Makefile b/net/atmsupport/Makefile index 22a15b0bdc0c..b8c0087042b0 100644 --- a/net/atmsupport/Makefile +++ b/net/atmsupport/Makefile @@ -17,7 +17,7 @@ COMMENT= Tools for testing the ATM subsystem LIB_DEPENDS= tcl84.1:${PORTSDIR}/lang/tcl84 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcldir=${LOCALBASE} diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile index 109ed08710c9..8043b91b7d9a 100644 --- a/net/avahi-app/Makefile +++ b/net/avahi-app/Makefile @@ -25,7 +25,7 @@ USE_GNOME?= gnomehack ltverhack glib20 intltool USE_GETTEXT= yes USE_GNOME_SUBR= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes AVAHI_SLAVE?= no CONFIGURE_ARGS?=--with-distro=freebsd \ diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile index 3432f9cd5908..ea245ae2000c 100644 --- a/net/courier-authlib-ldap/Makefile +++ b/net/courier-authlib-ldap/Makefile @@ -8,7 +8,7 @@ PKGNAMESUFFIX= -ldap COMMENT= LDAP support for the Courier authentication library -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net mail MASTERDIR= ${.CURDIR}/../../security/courier-authlib diff --git a/net/dictd/Makefile b/net/dictd/Makefile index 38ae5138e4b4..732828288369 100644 --- a/net/dictd/Makefile +++ b/net/dictd/Makefile @@ -22,7 +22,7 @@ MAN8= dictd.8 USE_RC_SUBR= ${PORTNAME}.sh USE_BISON= build -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \ --without-local-zlib diff --git a/net/freeradius-client/Makefile b/net/freeradius-client/Makefile index 17d75dcd1409..2e00c2fb0011 100644 --- a/net/freeradius-client/Makefile +++ b/net/freeradius-client/Makefile @@ -17,7 +17,7 @@ COMMENT= Client library and basic utilities for RADIUS AAA USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFLICTS= radiusclient-ng-[0-9]* diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 42a12eb19fd3..dded7173ffe6 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -7,7 +7,7 @@ PORTNAME= freeradius PORTVERSION?= 1.1.7 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ @@ -39,7 +39,7 @@ CONFLICTS+= freeradius-mysql-[0-9].* freeradius-[02-9].* NO_LATEST_LINK= yes USE_RC_SUBR= radiusd.sh -USE_AUTOTOOLS= libltdl:15 libtool:15 autoconf:262 +USE_AUTOTOOLS= libltdl:22 libtool:22 autoconf:262 USE_GMAKE= yes USE_OPENSSL= yes MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 49715c4b0efb..47021bd2a064 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -32,7 +32,7 @@ CONFLICTS= gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \ freeradius-mysql-[0-9].* freeradius-[013-9].* USE_RC_SUBR= radiusd.sh -USE_AUTOTOOLS= libltdl:15 libtool:15 autoconf:262 +USE_AUTOTOOLS= libltdl:22 libtool:22 autoconf:262 USE_GMAKE= yes USE_OPENSSL= yes MAKE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/net/gnet/Makefile b/net/gnet/Makefile index 2deb4f08c257..c08e27e04cd0 100644 --- a/net/gnet/Makefile +++ b/net/gnet/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.gnetlibrary.org/src/ MAINTAINER= araujo@FreeBSD.org COMMENT= A simple network library built upon Glib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib12 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/gnet2/Makefile b/net/gnet2/Makefile index 84563062e245..0ee0edcbe7fe 100644 --- a/net/gnet2/Makefile +++ b/net/gnet2/Makefile @@ -15,7 +15,7 @@ PKGNAMESUFFIX= 2 MAINTAINER= gnome@FreeBSD.org COMMENT= A simple network library built upon Glib-2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index 531a5fcb1e05..109839098a9e 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -6,7 +6,7 @@ PORTNAME= gnu-radius PORTVERSION= 1.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= radius @@ -19,7 +19,7 @@ CONFLICTS= freeradius-0.* openradius-0.* radiusd-cistron-1.* USE_RC_SUBR= radiusd.sh USE_SUBMAKE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/gsk/Makefile b/net/gsk/Makefile index 186535234d1b..e2b5a947abb7 100644 --- a/net/gsk/Makefile +++ b/net/gsk/Makefile @@ -15,7 +15,7 @@ COMMENT= A C library for writing servers USE_GNOME= glib20 gnomehack USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-gtk-doc USE_LDCONFIG= yes diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile index 1e6d2fc93947..b4c8b552db23 100644 --- a/net/honeyd/Makefile +++ b/net/honeyd/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent \ BUILD_DEPENDS= ${LOCALBASE}/lib/libpcre.a:${PORTSDIR}/devel/pcre USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-libdnet=${LOCALBASE} \ --with-libevent=${LOCALBASE} MAKE_JOBS_SAFE= yes diff --git a/net/howl/Makefile b/net/howl/Makefile index 9912619494d4..109bd79de45a 100644 --- a/net/howl/Makefile +++ b/net/howl/Makefile @@ -15,7 +15,7 @@ COMMENT= Zeroconf/Bonjour(tm) implementation CONFLICTS= avahi-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnometarget pkgconfig USE_LDCONFIG= yes diff --git a/net/ilbc/Makefile b/net/ilbc/Makefile index 66b044d0eaae..dad2e5ec9d20 100644 --- a/net/ilbc/Makefile +++ b/net/ilbc/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://simon.morlat.free.fr/download/1.2.x/source/ MAINTAINER= asm@asm.kiev.ua COMMENT= Internet Low Bit Rate codec (RFC3951) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 6163bd59cb4a..1af23d15353f 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -30,7 +30,7 @@ USE_GMAKE= yes USE_OPENSSL= yes USE_XORG= xtst -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 DO_NOT_COMPILE+=kopete lanbrowsing filesharing diff --git a/net/kmuddy/Makefile b/net/kmuddy/Makefile index c218c46260db..dace72ac0a70 100644 --- a/net/kmuddy/Makefile +++ b/net/kmuddy/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= mxp:${PORTSDIR}/net/libmxp RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_KDELIBS_VER=3 USE_LDCONFIG= yes diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile index be855b1181b4..48e2433b53b2 100644 --- a/net/knemo-kde4/Makefile +++ b/net/knemo-kde4/Makefile @@ -16,7 +16,7 @@ COMMENT= Network monitor for KDE USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/net/knemo/Makefile b/net/knemo/Makefile index be855b1181b4..48e2433b53b2 100644 --- a/net/knemo/Makefile +++ b/net/knemo/Makefile @@ -16,7 +16,7 @@ COMMENT= Network monitor for KDE USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/net/lanbrowsing/Makefile b/net/lanbrowsing/Makefile index 499771454358..c8dc38d3a2d9 100644 --- a/net/lanbrowsing/Makefile +++ b/net/lanbrowsing/Makefile @@ -27,7 +27,7 @@ PREFIX= ${KDE_PREFIX} USE_RC_SUBR= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdenetwork-${PORTVERSION} USE_LDCONFIG= yes diff --git a/net/libgnetwork/Makefile b/net/libgnetwork/Makefile index fd2d89889e19..4ffe33182cb8 100644 --- a/net/libgnetwork/Makefile +++ b/net/libgnetwork/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A GLib-based networking wrapper -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GETTEXT= yes USE_GNOME= gnomeprefix gnomehack intlhack gconf2 diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile index 9e97aa7d308d..b5a62e7d2f79 100644 --- a/net/libgweather/Makefile +++ b/net/libgweather/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack gtk20 gnomevfs2 ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile index fa16513d63a1..e2ddd3171c9e 100644 --- a/net/libnet-devel/Makefile +++ b/net/libnet-devel/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r1$//}-RC-01 MAINTAINER= ports@FreeBSD.org COMMENT= A C library for creating IP packets (development version) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/libnetdude/Makefile b/net/libnetdude/Makefile index f0868a5c004a..3588b7739f26 100644 --- a/net/libnetdude/Makefile +++ b/net/libnetdude/Makefile @@ -16,7 +16,7 @@ COMMENT= A library for manipulating libpcap/tcpdump trace files LIB_DEPENDS= pcapnav.0:${PORTSDIR}/net/libpcapnav -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= glib12 CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR} diff --git a/net/libnss-mysql/Makefile b/net/libnss-mysql/Makefile index 44e61638bcd2..d95115243e76 100644 --- a/net/libnss-mysql/Makefile +++ b/net/libnss-mysql/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libnss-mysql MAINTAINER= vd@FreeBSD.org COMMENT= NSS module using a MySQL database for backend -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-mysql=${LOCALBASE} USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/net/libosip/Makefile b/net/libosip/Makefile index e23e356ed878..a7b4dbb5add5 100644 --- a/net/libosip/Makefile +++ b/net/libosip/Makefile @@ -18,7 +18,7 @@ COMMENT= A low layer of SIP implementation CONFLICTS= libosip2-2* USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-debug --disable-trace USE_LDCONFIG= yes diff --git a/net/libpcapnav/Makefile b/net/libpcapnav/Makefile index 09677a2f5d7f..ba485ad35978 100644 --- a/net/libpcapnav/Makefile +++ b/net/libpcapnav/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= netdude MAINTAINER= brenton.chang@gmail.com COMMENT= A libpcap wrapper library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR} GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/librsync/Makefile b/net/librsync/Makefile index 30264856eb13..212aa71f0e7a 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -18,7 +18,7 @@ COMMENT= Library for delta compression of streams LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/libsocket++/Makefile b/net/libsocket++/Makefile index d60681905bab..6c74285f2560 100644 --- a/net/libsocket++/Makefile +++ b/net/libsocket++/Makefile @@ -18,7 +18,7 @@ COMMENT= A C++ wrapper library to the sockets GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:19 autoconf:262 libtool:22 SCRIPTS_ENV+= ACLOCAL_FLAGS="-I ${LOCALBASE}/share/aclocal/" INFO= socket++ diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile index f55df820faca..8311d7e7030c 100644 --- a/net/libsocketcpp/Makefile +++ b/net/libsocketcpp/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= libsocket MAINTAINER= ports@FreeBSD.org COMMENT= A C++ wrapper library to the sockets -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/linc/Makefile b/net/linc/Makefile index 28093a582565..afde04f6bd78 100644 --- a/net/linc/Makefile +++ b/net/linc/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --disable-gtk-doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile index c3308788d881..2b81e12e29a4 100644 --- a/net/linphone-base/Makefile +++ b/net/linphone-base/Makefile @@ -22,7 +22,7 @@ CONFLICTS= ortp-[0-9]* USE_GNOME= glib20 gnomehack gnometarget intlhack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure oRTP/configure mediastreamer2/configure CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --disable-ipv6 --disable-manual --disable-ewarning \ diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 1a2d80c889c9..c890d29836ee 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_ICONV= yes USE_BDB= 41+ diff --git a/net/netdude/Makefile b/net/netdude/Makefile index 2c5785508ae7..12358d8fa10c 100644 --- a/net/netdude/Makefile +++ b/net/netdude/Makefile @@ -8,7 +8,7 @@ PORTNAME= netdude PORTVERSION= 0.4.8a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +18,7 @@ COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude -USE_AUTOTOOLS= libltdl:15 libtool:15 +USE_AUTOTOOLS= libltdl:22 libtool:22 USE_ICONV= yes USE_GETTEXT= yes GNU_CONFIGURE= yes diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 84e2b7e0b051..3bc047c36446 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \ DBDIR?= /var/db MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 automake:19 autoconf:262 +USE_AUTOTOOLS= libtool:22 automake:19 autoconf:262 USE_GNOME= libxml2 USE_GMAKE= yes USE_OPENSSL= yes diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist index b1dcf7cd8f23..0f05754c1b77 100644 --- a/net/ntop/pkg-plist +++ b/net/ntop/pkg-plist @@ -5,16 +5,12 @@ etc/ntop/oui.txt.gz etc/ntop/specialMAC.txt.gz lib/libcpacketPlugin-%%PORTVERSION%%.so lib/libcpacketPlugin.so -lib/libcpacketPlugin.a lib/libicmpPlugin-%%PORTVERSION%%.so lib/libicmpPlugin.so -lib/libicmpPlugin.a lib/liblastSeenPlugin-%%PORTVERSION%%.so lib/liblastSeenPlugin.so -lib/liblastSeenPlugin.a lib/libnetflowPlugin-%%PORTVERSION%%.so lib/libnetflowPlugin.so -lib/libnetflowPlugin.a lib/libntop-%%PORTVERSION%%.so lib/libntop.so lib/libntop.a @@ -25,16 +21,12 @@ lib/libntopreport.a lib/libntopreport.la lib/libpdaPlugin-%%PORTVERSION%%.so lib/libpdaPlugin.so -lib/libpdaPlugin.a lib/libremotePlugin-%%PORTVERSION%%.so lib/libremotePlugin.so -lib/libremotePlugin.a lib/librrdPlugin-%%PORTVERSION%%.so lib/librrdPlugin.so -lib/librrdPlugin.a lib/libsflowPlugin-%%PORTVERSION%%.so lib/libsflowPlugin.so -lib/libsflowPlugin.a lib/ntop/plugins/cpacketPlugin.so lib/ntop/plugins/icmpPlugin.so lib/ntop/plugins/lastSeenPlugin.so diff --git a/net/openldap23-server/Makefile b/net/openldap23-server/Makefile index 57c0a711d768..42bac078c4ae 100644 --- a/net/openldap23-server/Makefile +++ b/net/openldap23-server/Makefile @@ -114,7 +114,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} @@ -168,7 +168,7 @@ USE_RC_SUBR= slapd.sh ${SLURPDSH} EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) -USE_AUTOTOOLS+= libltdl:15 +USE_AUTOTOOLS+= libltdl:22 CONFIGURE_ARGS+= --enable-modules PLIST_SUB+= MODULES="" .else diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index d188f749a92b..e646a0014281 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -126,7 +126,7 @@ CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} @@ -178,7 +178,7 @@ USE_RC_SUBR= slapd.sh EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in .if defined(WITH_MODULES) || !defined(WITHOUT_DYNAMIC_BACKENDS) || defined(WITH_SLAPI) -USE_AUTOTOOLS+= libltdl:15 +USE_AUTOTOOLS+= libltdl:22 CONFIGURE_ARGS+= --enable-modules PLIST_SUB+= MODULES="" .else diff --git a/net/openslp/Makefile b/net/openslp/Makefile index 56d170a78d4f..7ea1acf69888 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= openslp MAINTAINER= marcus@FreeBSD.org COMMENT= Open-source implementation of the Service Location Protocol -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/net/pvm++/Makefile b/net/pvm++/Makefile index 57d859f48aee..b80999678dea 100644 --- a/net/pvm++/Makefile +++ b/net/pvm++/Makefile @@ -18,7 +18,7 @@ COMMENT= A C++-Library for PVM BUILD_DEPENDS= ${LOCALBASE}/lib/libpvm3.a:${PORTSDIR}/net/pvm -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pvm-incs=${LOCALBASE}/include \ diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 6dd0b4c364f2..90df7c0f5318 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -23,7 +23,7 @@ COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4, IS-IS route software CONFLICTS= openbgpd-[0-9]* zebra-0* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5_BUILD= yes diff --git a/net/roadrunner/Makefile b/net/roadrunner/Makefile index c6f460cd2a41..d8882cfb5f4f 100644 --- a/net/roadrunner/Makefile +++ b/net/roadrunner/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A portable BEEP protocol implementation USE_GNOME= glib20 libxml2 pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_GMAKE= yes diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile index 256f0cb18237..5d0916ec8f01 100644 --- a/net/sdl_net/Makefile +++ b/net/sdl_net/Makefile @@ -14,7 +14,7 @@ DISTNAME= SDL_net-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A small sample cross-platform networking library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/net/serveez/Makefile b/net/serveez/Makefile index 19438d975bc3..0d4ab5edd4d7 100644 --- a/net/serveez/Makefile +++ b/net/serveez/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile GUILE_CONFIG?= ${LOCALBASE}/bin/guile-config -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/net/smb4k/Makefile b/net/smb4k/Makefile index e05c4cc90213..aebbe7fe4f3a 100644 --- a/net/smb4k/Makefile +++ b/net/smb4k/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo \ USE_KDEBASE_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/net/tapidbus/Makefile b/net/tapidbus/Makefile index 089bc4fe01f3..6ddbeff64796 100644 --- a/net/tapidbus/Makefile +++ b/net/tapidbus/Makefile @@ -18,7 +18,7 @@ COMMENT= Abstraction layer for interprocess communication LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= pkgconfig glib20 gnomehack USE_LDCONFIG= yes diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile index 24c000b68a11..fa894ac3316d 100644 --- a/net/tn5250/Makefile +++ b/net/tn5250/Makefile @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= 5250 Telnet protocol and Terminal USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-os-dir=no --with-ssl=${OPENSSLBASE} USE_LDCONFIG= yes diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile index 3cad36d3e6af..74659780cc45 100644 --- a/net/torsocks/Makefile +++ b/net/torsocks/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma MAINTAINER= andy.lavr@gmail.com COMMENT= Most SOCKS-friendly applications way with Tor -USE_AUTOTOOLS= libtool:15 aclocal:110 autoconf:262 +USE_AUTOTOOLS= libtool:22 aclocal:110 autoconf:262 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal USE_GMAKE= yes diff --git a/net/trickle/Makefile b/net/trickle/Makefile index fbc84589b207..77b9b08b9fd7 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -16,7 +16,7 @@ COMMENT= Lightweight, portable bandwidth shaper LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile index 90df0102bb9f..892c993fc9c9 100644 --- a/net/tsclient/Makefile +++ b/net/tsclient/Makefile @@ -20,7 +20,7 @@ OPTIONS= GNOME "Build with gnome support" on \ TIGHTVNC "vncviewer support" off \ XNEST "X via Xnest support (experimental)" off -USE_AUTOTOOLS= libtool:15 automake:19 autoconf:262 +USE_AUTOTOOLS= libtool:22 automake:19 autoconf:262 USE_GNOME= gtk20 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile index 43b9da96beaa..2e1793b0c881 100644 --- a/net/twinkle/Makefile +++ b/net/twinkle/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= ccgnu2-1.6.0:${PORTSDIR}/devel/commoncpp \ zrtpcpp.0:${PORTSDIR}/devel/libzrtpcpp GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build USE_XORG= xext USE_GMAKE= yes diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile index 66bec17ee809..e1d44f9b280d 100644 --- a/net/ulxmlrpcpp/Makefile +++ b/net/ulxmlrpcpp/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnometarget USE_ICONV= yes USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/net/uriparser/Makefile b/net/uriparser/Makefile index 44ed950b12e8..c30c599078b0 100644 --- a/net/uriparser/Makefile +++ b/net/uriparser/Makefile @@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--disable-doc --disable-test USE_BZIP2= yes USE_GNOME= pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes post-patch: diff --git a/net/xmlrpc-c-devel/Makefile b/net/xmlrpc-c-devel/Makefile index 12253418976d..e13c36c2e2b7 100644 --- a/net/xmlrpc-c-devel/Makefile +++ b/net/xmlrpc-c-devel/Makefile @@ -27,7 +27,7 @@ CONFLICTS= xmlrpc-epi-0.* xmlrpc-c-[0-9]* USE_GNOME= gnometarget USE_PERL5= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env GNU_CONFIGURE= yes MAKEFILE= GNUmakefile MAKE_ARGS= LIBTOOL="${LIBTOOL}" \ diff --git a/net/xmlrpc-c/Makefile b/net/xmlrpc-c/Makefile index 2431815a8601..46bf8ad8a5d3 100644 --- a/net/xmlrpc-c/Makefile +++ b/net/xmlrpc-c/Makefile @@ -28,7 +28,7 @@ CONFLICTS= xmlrpc-epi-0.* xmlrpc-c-devel-[0-9]* USE_GNOME= gnometarget USE_PERL5= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env GNU_CONFIGURE= yes MAKEFILE= GNUmakefile MAKE_ARGS= LIBTOOL="${LIBTOOL}" \ diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile index 555d382ca201..e0c17e3effd0 100644 --- a/net/xmlrpc-epi/Makefile +++ b/net/xmlrpc-epi/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 USE_GMAKE= yes USE_ICONV= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -liconv" CONFIGURE_ARGS= --program-transform="s|^|xre-|" \ diff --git a/news/fidogate-ds/Makefile b/news/fidogate-ds/Makefile index 3110306d1be2..c7715a15a71e 100644 --- a/news/fidogate-ds/Makefile +++ b/news/fidogate-ds/Makefile @@ -20,7 +20,7 @@ COMMENT= Fido-Internet Gateway and Tosser BUILD_DEPENDS= ${LOCALBASE}/news/bin/innconfval:${PORTSDIR}/news/inn .endif -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes USE_PERL5= yes diff --git a/news/fidogate-ds/pkg-plist b/news/fidogate-ds/pkg-plist index 24ee56e8127c..d31543285c82 100644 --- a/news/fidogate-ds/pkg-plist +++ b/news/fidogate-ds/pkg-plist @@ -33,7 +33,6 @@ bin/runinc bin/senduu bin/senduumail bin/sumcrc -lib/fidogate/libfidogate.a lib/fidogate/libfidogate.la lib/fidogate/libfidogate.so lib/fidogate/libfidogate.so.5 diff --git a/news/klibido/Makefile b/news/klibido/Makefile index 7096c8946edd..01715fd88bac 100644 --- a/news/klibido/Makefile +++ b/news/klibido/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= uu.3:${PORTSDIR}/converters/uulib \ USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile index 465674207220..57e7d8241e55 100644 --- a/palm/gnome-pilot/Makefile +++ b/palm/gnome-pilot/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier gnomepanel intlhack \ ltverhack USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pisock=${LOCALBASE} diff --git a/palm/synce-librapi2/Makefile b/palm/synce-librapi2/Makefile index 343457a0eda9..6f76e7c1ad69 100644 --- a/palm/synce-librapi2/Makefile +++ b/palm/synce-librapi2/Makefile @@ -17,7 +17,7 @@ COMMENT?= Utilities/libraries to make RAPI calls on WinCE devices LIB_DEPENDS+= synce.0:${PORTSDIR}/palm/synce-libsynce GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GNOME= gnomehack gnometarget USE_LDCONFIG= yes diff --git a/palm/synce-librra/Makefile b/palm/synce-librra/Makefile index e37a2ee0db68..d627db745e3a 100644 --- a/palm/synce-librra/Makefile +++ b/palm/synce-librra/Makefile @@ -22,7 +22,7 @@ OPTIONS?= TOOLS "Build with minor rra command line tools" on \ RECURR "Enable experimential recurrence support" off GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile index edaba5f372a2..75fa6cf866bc 100644 --- a/palm/synce-libsynce/Makefile +++ b/palm/synce-libsynce/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ hal.1:${PORTSDIR}/sysutils/hal GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GNOME= gnomehack gnometarget CONFIGURE_ARGS+= --with-libiconv-prefix="${LOCALBASE}" \ diff --git a/ports-mgmt/barry/Makefile b/ports-mgmt/barry/Makefile index 467c23e88dc3..c9d37d33719a 100644 --- a/ports-mgmt/barry/Makefile +++ b/ports-mgmt/barry/Makefile @@ -20,7 +20,7 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/portsdb:${PORTSDIR}/ports-mgmt/portupgrade USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/ports-mgmt/kports/Makefile b/ports-mgmt/kports/Makefile index 461c5b8e180d..376f71255301 100644 --- a/ports-mgmt/kports/Makefile +++ b/ports-mgmt/kports/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE3-Version of your favorite frontend to the Ports USE_BZIP2= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFLICTS= kports-0.[89]* RUN_DEPENDS+= portupgrade:${PORTSDIR}/ports-mgmt/portupgrade diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index 4386ac85eb26..f6b3220d18cd 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= fontforge.1 fontimage.1 fontlint.1 sfddiff.1 diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile index c00e0f2d6f08..ea4c4c4d36fb 100644 --- a/print/freetype-tools/Makefile +++ b/print/freetype-tools/Makefile @@ -27,7 +27,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base \ BUILD_DEPENDS= ${RUN_DEPENDS} USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared TEXMFMAIN= ${PREFIX}/share/texmf diff --git a/print/freetype/Makefile b/print/freetype/Makefile index 2e979cde72ce..8d07b7d01b82 100644 --- a/print/freetype/Makefile +++ b/print/freetype/Makefile @@ -20,7 +20,7 @@ MASTER_SITE_SUBDIR= freetype1 MAINTAINER= ports@FreeBSD.org COMMENT= A free and portable TrueType font rendering engine -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile index 492cbaae6aa5..1d3b75cd1aef 100644 --- a/print/freetype2/Makefile +++ b/print/freetype2/Makefile @@ -22,7 +22,7 @@ DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= A free and portable TrueType font rendering engine -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes diff --git a/print/ft2demos/Makefile b/print/ft2demos/Makefile index a156bf705812..46e2c2adb28d 100644 --- a/print/ft2demos/Makefile +++ b/print/ft2demos/Makefile @@ -25,7 +25,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes USE_XORG= xext USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env MAKE_ENV= TOP_DIR="${FREETYPE_WRKSRC}" MAKE_ARGS= X11_PATH="${LOCALBASE}" diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile index 40468abe42ec..a0e7526d119d 100644 --- a/print/gnome-cups-manager/Makefile +++ b/print/gnome-cups-manager/Makefile @@ -20,7 +20,7 @@ COMMENT= Admistration tool for cups LIB_DEPENDS= gnomecups-1.0.1:${PORTSDIR}/print/libgnomecups RUN_DEPENDS= gnomesu:${PORTSDIR}/security/libgnomesu -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeprintui libgnomeui \ diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index f7b51f3b452d..729f3d16176b 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -24,7 +24,7 @@ USE_GHOSTSCRIPT_RUN= yes PLIST_SUB= VERSION=${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_PERL5= yes diff --git a/print/kaspaliste/Makefile b/print/kaspaliste/Makefile index ba0a67e518a0..df43d2128ec2 100644 --- a/print/kaspaliste/Makefile +++ b/print/kaspaliste/Makefile @@ -17,7 +17,7 @@ COMMENT= Bibliography tool for KDE/Postgres/BibTeX USE_PGSQL= yes USE_KDEBASE_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ARGS+= --with-pg-includes=${LOCALBASE}/include \ --with-pg-libs=${LOCALBASE}/lib diff --git a/print/kcdlabel/Makefile b/print/kcdlabel/Makefile index 7de55c8777ee..9a9f3711848c 100644 --- a/print/kcdlabel/Makefile +++ b/print/kcdlabel/Makefile @@ -17,7 +17,7 @@ COMMENT= Create covers, labels and booklets for your CD cases USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/print/kover/Makefile b/print/kover/Makefile index f86cc9d3c200..d4ca5f38260c 100644 --- a/print/kover/Makefile +++ b/print/kover/Makefile @@ -17,7 +17,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= kover.1 cddb-id.1 diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile index 3ce173894a1c..e6786614eb10 100644 --- a/print/libgnomecups/Makefile +++ b/print/libgnomecups/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack glib20 USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index f0888034d009..a5886d17d9ad 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -29,7 +29,7 @@ USE_GNOME= gnomeprefix intlhack gnomehack gnomehier glib20 pango libxml2 \ libartlgpl2 ltverhack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile index 7c94374de98e..57125a100d10 100644 --- a/print/libgnomeprintmm/Makefile +++ b/print/libgnomeprintmm/Makefile @@ -18,7 +18,7 @@ COMMENT= C++ bindings for the GNOME print support library LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprint diff --git a/print/libijs/Makefile b/print/libijs/Makefile index 1ed0c58d3801..e47cb046ff3c 100644 --- a/print/libijs/Makefile +++ b/print/libijs/Makefile @@ -19,7 +19,7 @@ COMMENT= C library that supports plugin printer driver for Ghostscript USE_BZIP2= yes USE_GNOME= gnometarget lthack pkgconfig USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= ijs-config.1 diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile index c15ab50437d9..daafb8ed7d30 100644 --- a/print/libpaper/Makefile +++ b/print/libpaper/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A library providing routines for paper size management -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/print/libppd/Makefile b/print/libppd/Makefile index 2e66ed2f81f9..eae4fcb1e6bc 100644 --- a/print/libppd/Makefile +++ b/print/libppd/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lpr MAINTAINER= e-masson@kisoft-services.com COMMENT= A library providing routines for ppd files -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= Yes USE_GNOME= glib12 diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile index 21986e82ce42..9303a5f869f0 100644 --- a/print/libspectre/Makefile +++ b/print/libspectre/Makefile @@ -16,7 +16,7 @@ COMMENT= A small library for rendering Postscript documents LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack gnomeprefix ltverhack USE_GHOSTSCRIPT=yes diff --git a/print/panda/Makefile b/print/panda/Makefile index 1d9b9db5e032..a3b0fe4084a7 100644 --- a/print/panda/Makefile +++ b/print/panda/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_BDB= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --enable-berkeley-db USE_LDCONFIG= yes diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile index c3b3d8d82fd1..142208bf5ef1 100644 --- a/print/pdflib/Makefile +++ b/print/pdflib/Makefile @@ -18,7 +18,7 @@ RESTRICTED= many odd restrictions on usage and distribution USE_LDCONFIG= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-java=no --with-py=no --with-ruby=no --with-tcl=no .if defined(WITH_PERL) diff --git a/print/pdflib/files/patch-libtool22 b/print/pdflib/files/patch-libtool22 new file mode 100644 index 000000000000..9c6a7b5b82e2 --- /dev/null +++ b/print/pdflib/files/patch-libtool22 @@ -0,0 +1,11 @@ +--- config/mkmainlib.inc.in.orig 2009-07-11 20:11:59.000000000 -0500 ++++ config/mkmainlib.inc.in 2009-07-11 20:12:49.000000000 -0500 +@@ -29,7 +29,7 @@ + @-if test "$(WITH_SHARED)" = "no"; then \ + cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\ + fi +- $(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir); ++ $(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(DESTDIR)$(libdir); + @-if test "$(WITH_SHARED)" = "yes"; then \ + $(LIBTOOL) -n --finish $(DESTDIR)$(libdir);\ + else\ diff --git a/print/pslib/Makefile b/print/pslib/Makefile index 1e21e8835527..ccda6fd8ead8 100644 --- a/print/pslib/Makefile +++ b/print/pslib/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ USE_GNOME= gnomehack gnometarget intlhack pkgconfig USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lintl" USE_LDCONFIG= yes diff --git a/russian/ksocrat/Makefile b/russian/ksocrat/Makefile index 810645e66ecc..eef7bc187fd9 100644 --- a/russian/ksocrat/Makefile +++ b/russian/ksocrat/Makefile @@ -20,7 +20,7 @@ COMMENT= KSocrat is the simple English/Russian Russian/English dictionary USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes RESTRICTED= "Redistribution not allowed" diff --git a/science/buddy/Makefile b/science/buddy/Makefile index d7b4f08de605..150d192c704e 100644 --- a/science/buddy/Makefile +++ b/science/buddy/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= buddy MAINTAINER= llwang@infor.org COMMENT= A Binary Decision Diagram library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/science/ghmm/Makefile b/science/ghmm/Makefile index 62cc53966adf..7d21dbb8ecd7 100644 --- a/science/ghmm/Makefile +++ b/science/ghmm/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= clsung@FreeBSD.org COMMENT= General Hidden Markov Model Library in C -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-0.7.0 diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 489b17b758b3..f17188444814 100644 --- a/science/gnudatalanguage/Makefile +++ b/science/gnudatalanguage/Makefile @@ -36,7 +36,7 @@ LIB_DEPENDS+= plplotd.11:${PORTSDIR}/math/plplot \ dps.0:${PORTSDIR}/x11/dgs \ readline.6:${PORTSDIR}/devel/readline -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/ImageMagick" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" diff --git a/science/gromacs/Makefile b/science/gromacs/Makefile index 2a61ad918d07..8c11148bb714 100644 --- a/science/gromacs/Makefile +++ b/science/gromacs/Makefile @@ -15,7 +15,7 @@ COMMENT= Compute molecular dynamics USE_GNOME= libxml2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib CONFIGURE_ARGS= --exec-prefix=${PREFIX} --program-suffix="" --enable-shared diff --git a/science/hdf5/Makefile b/science/hdf5/Makefile index d73c056be3c0..809d7de7d675 100644 --- a/science/hdf5/Makefile +++ b/science/hdf5/Makefile @@ -19,7 +19,7 @@ MAINTAINER= koziol@hdfgroup.org COMMENT= Hierarchical Data Format library (from NCSA) USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes LIBTOOLFILES= configure c++/configure CONFIGURE_ARGS= --disable-debug \ diff --git a/science/kst/Makefile b/science/kst/Makefile index 222de25ffef6..241260d35ecf 100644 --- a/science/kst/Makefile +++ b/science/kst/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= cfitsio.0:${PORTSDIR}/astro/cfitsio \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/science/kst2/Makefile b/science/kst2/Makefile index 222de25ffef6..241260d35ecf 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= cfitsio.0:${PORTSDIR}/astro/cfitsio \ USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/science/libctl/Makefile b/science/libctl/Makefile index a8cb1905c42d..a44a4066174c 100644 --- a/science/libctl/Makefile +++ b/science/libctl/Makefile @@ -17,7 +17,7 @@ COMMENT= Control Language Library LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_FORTRAN= yes USE_LDCONFIG= yes diff --git a/science/minc/Makefile b/science/minc/Makefile index 1738ab3a7e76..cac55ce1f40a 100644 --- a/science/minc/Makefile +++ b/science/minc/Makefile @@ -27,7 +27,7 @@ COMMENT= Medical Imaging NetCDF LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/science/minc2/Makefile b/science/minc2/Makefile index 80a04db8fc10..89aae2eb51bd 100644 --- a/science/minc2/Makefile +++ b/science/minc2/Makefile @@ -28,7 +28,7 @@ COMMENT= Medical Imaging NetCDF LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf \ hdf5.0:${PORTSDIR}/science/hdf5 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/science/openbabel/Makefile b/science/openbabel/Makefile index 7bd6591a97ec..dbea300858f2 100644 --- a/science/openbabel/Makefile +++ b/science/openbabel/Makefile @@ -15,7 +15,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= Chemistry file translation program USE_GNOME= gnomehack gnometarget libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= obchiral.1 obconformer.1 obenergy.1 obfit.1 obgen.1 obgrep.1 \ diff --git a/science/silo/Makefile b/science/silo/Makefile index a2d8e9146d51..54e5d49de26f 100644 --- a/science/silo/Makefile +++ b/science/silo/Makefile @@ -16,7 +16,7 @@ COMMENT= A mesh and field I/O library and scientific database LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" diff --git a/science/szip/Makefile b/science/szip/Makefile index accaa9a32f85..28583f393de1 100644 --- a/science/szip/Makefile +++ b/science/szip/Makefile @@ -19,7 +19,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= wenheping@gmail.com COMMENT= Lossless compression library for scientific data -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes DOCFILE= Release_notes_2_0.pdf diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile index b8918fb9fbec..1bff1a04fd7b 100644 --- a/science/vis5d+/Makefile +++ b/science/vis5d+/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= netcdf.4:${PORTSDIR}/science/netcdf \ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick USE_FORTRAN= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= yes USE_GNOME= gnometarget gtk12 USE_ICONV= yes diff --git a/science/xloops-ginac/Makefile b/science/xloops-ginac/Makefile index 20032c5ccd42..12529c3be047 100644 --- a/science/xloops-ginac/Makefile +++ b/science/xloops-ginac/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= ginac-1.4.0:${PORTSDIR}/math/GiNaC USE_GNOME= gnometarget USE_GMAKE= yes USE_AUTOTOOLS= aclocal:110 autoheader:262 autoconf:262 automake:110 \ - libtool:15 + libtool:22 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile index c461ab849394..0471a4a2296b 100644 --- a/security/apache-xml-security-c/Makefile +++ b/security/apache-xml-security-c/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS+= xerces-c.27:${PORTSDIR}/textproc/xerces-c2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-xerces=${LOCALBASE} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile index 70a7a254bbdb..ba190f3b9f73 100644 --- a/security/beecrypt/Makefile +++ b/security/beecrypt/Makefile @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= BeeCrypt is an open source cryptography library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/bioapi/Makefile b/security/bioapi/Makefile index b8d592856532..b14f3aa5733e 100644 --- a/security/bioapi/Makefile +++ b/security/bioapi/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://www.qrivy.net/~michael/blua/bioapi/ \ MAINTAINER= fli@shapeshifter.se COMMENT= BioAPI library implementation -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes # Problems reported with higher optimization levels diff --git a/security/borzoi/Makefile b/security/borzoi/Makefile index 4509f60219cd..348fb4e625a1 100644 --- a/security/borzoi/Makefile +++ b/security/borzoi/Makefile @@ -18,7 +18,7 @@ COMMENT= An Elliptic Curve Cryptography Library BUILD_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl RUN_DEPENDS= ${LOCALBASE}/lib/libntl.a:${PORTSDIR}/math/ntl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 40ce6cc5ec65..19373e9ec4be 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -34,7 +34,7 @@ OPTIONS+= GDBM "Use gdbm instead of system bdb" off .else # !defined(PKGNAMESUFFIX) -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_BZIP2= yes USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/security/cryptplug/Makefile b/security/cryptplug/Makefile index 81966cef158e..b28514ae9ad0 100644 --- a/security/cryptplug/Makefile +++ b/security/cryptplug/Makefile @@ -18,7 +18,7 @@ COMMENT= A collection of plug-ins to cryptographic engines BUILD_DEPENDS= ${LOCALBASE}/lib/libgpgme03.so.9:${PORTSDIR}/security/gpgme03 \ gpg-agent:${PORTSDIR}/security/gnupg -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/security/cvm/Makefile b/security/cvm/Makefile index 6cbd4a626ffe..4f1a7f967abb 100644 --- a/security/cvm/Makefile +++ b/security/cvm/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= bg.2:${PORTSDIR}/devel/bglibs CONFLICTS= bglibs-1.00* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= #none USE_LDCONFIG= yes LDFLAGS?= -s diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index 0e38f793f669..97a52f55f9f8 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -28,7 +28,7 @@ INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes GNU_CONFIGURE= yes diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index e5ee41ccfde1..1852e3123977 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -19,7 +19,7 @@ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) LATEST_LINK= ${PORTNAME}2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}2 diff --git a/security/distcache-devel/Makefile b/security/distcache-devel/Makefile index b82f0d35e6d1..f5db40fbe952 100644 --- a/security/distcache-devel/Makefile +++ b/security/distcache-devel/Makefile @@ -22,7 +22,7 @@ CONFLICTS= distcache-1.4* USE_BZIP2= yes USE_RC_SUBR= dc_server.sh -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes LIBTOOLFILES= configure ssl/configure USE_LDCONFIG= yes diff --git a/security/distcache/Makefile b/security/distcache/Makefile index f54af1346a95..de887a7143ab 100644 --- a/security/distcache/Makefile +++ b/security/distcache/Makefile @@ -20,7 +20,7 @@ CONFLICTS= distcache-devel-* USE_BZIP2= yes USE_RC_SUBR= dc_server.sh -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes USE_LDCONFIG= yes diff --git a/security/engine_pkcs11/Makefile b/security/engine_pkcs11/Makefile index 17374b219d5c..eacc02afde65 100644 --- a/security/engine_pkcs11/Makefile +++ b/security/engine_pkcs11/Makefile @@ -15,7 +15,7 @@ COMMENT= An implementation of a PKCS\#11 engine for OpenSSL LIB_DEPENDS= p11.3:${PORTSDIR}/security/libp11 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig diff --git a/security/fakeroot/Makefile b/security/fakeroot/Makefile index 7e17d31cf89a..96cb74dafe7c 100644 --- a/security/fakeroot/Makefile +++ b/security/fakeroot/Makefile @@ -17,7 +17,7 @@ COMMENT= Simulate the root user behaviour GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-ipc=tcp -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 150b78ef1ede..ae3f961f4f49 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2 USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-pam-dir="${PREFIX}/lib" CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/security/gnutls-devel/Makefile b/security/gnutls-devel/Makefile index d368a16bfca8..0cb462516aac 100644 --- a/security/gnutls-devel/Makefile +++ b/security/gnutls-devel/Makefile @@ -24,7 +24,7 @@ USE_ICONV= yes USE_GNOME= pkgconfig ltverhack GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 4ab56b76f9a2..6bf98983cb3d 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -26,7 +26,7 @@ USE_GNOME= pkgconfig ltverhack GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -fPIC" LDFLAGS="${LDFLAGS}" diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index d1e5c9433e55..670c5c8b6a0f 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -19,7 +19,7 @@ COMMENT= A library to make access to GnuPG easier LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile index 110de3fda8f8..dc766c581f85 100644 --- a/security/gpgme03/Makefile +++ b/security/gpgme03/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth LATEST_LINK= gpgme03 -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index c455c7800cdf..fb4912501989 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -22,7 +22,7 @@ OPTIONS+= LDAP "Use OpenLDAP as the KDC backend" off OPTIONS+= CRACKLIB "Use CrackLib for password quality checking" off OPTIONS+= X11 "Build X11 utilies" off -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 9039cee88f59..828610c330a2 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -23,7 +23,7 @@ USE_RC_SUBR= racoon.sh USE_OPENSSL= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --sysconfdir=${PREFIX}/etc/racoon \ diff --git a/security/kgpg/Makefile b/security/kgpg/Makefile index 6503dd8c24f4..e63ec54ee084 100644 --- a/security/kgpg/Makefile +++ b/security/kgpg/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1 CONFLICTS= kdeutils-3.[2-6].* USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER= 3 post-patch: diff --git a/security/klamav/Makefile b/security/klamav/Makefile index cf8e4910a220..ada48b54ff93 100644 --- a/security/klamav/Makefile +++ b/security/klamav/Makefile @@ -27,8 +27,8 @@ USE_GNOME= pkgconfig USE_GETTEXT= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 aclocal:19 - +USE_AUTOTOOLS= libtool:22 aclocal:19 +LIBTOOLFILES= acinclude.m4 configure CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS} -lintl -L${PREFIX}/lib" CONFIGURE_ARGS+=--with-qt-dir=${QT_PREFIX} \ --without-included-sqlite @@ -40,6 +40,6 @@ USE_KDELIBS_VER= 3 pre-configure: @${CP} ${LTMAIN} ${WRKSRC}/admin @${CP} ${LIBTOOL_M4} ${WRKSRC}/admin - @${CP} ${PREFIX}/include/clamav-config.h ${WRKSRC}/src/klamd + @${CP} ${LOCALBASE}/include/clamav-config.h ${WRKSRC}/src/klamd .include <bsd.port.post.mk> diff --git a/security/kopete-otr/Makefile b/security/kopete-otr/Makefile index 8012be95e8fb..5d6d8c2c20b8 100644 --- a/security/kopete-otr/Makefile +++ b/security/kopete-otr/Makefile @@ -25,7 +25,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/kovpn/Makefile b/security/kovpn/Makefile index bad51b97e696..d371cb11ca85 100644 --- a/security/kovpn/Makefile +++ b/security/kovpn/Makefile @@ -27,7 +27,7 @@ INSTALLS_ICONS= yes USE_GMAKE= yes USE_XORG= xpm GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:19:env libtool:22 .include <bsd.port.pre.mk> diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile index 10f8cdaec16f..c132c0249ae9 100644 --- a/security/krb5-16/Makefile +++ b/security/krb5-16/Makefile @@ -7,7 +7,7 @@ PORTNAME= krb5 PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ @@ -30,7 +30,7 @@ WITH_OPENSSL_PORT= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared # CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ diff --git a/security/krb5-16/files/patch-config::shlib.conf b/security/krb5-16/files/patch-config::shlib.conf index 18f91fffc6d5..5d680b5487ca 100644 --- a/security/krb5-16/files/patch-config::shlib.conf +++ b/security/krb5-16/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006 -+++ config/shlib.conf Wed Mar 28 17:17:55 2007 -@@ -258,22 +258,15 @@ +--- config/shlib.conf.orig 2009-07-13 14:48:25.000000000 +0200 ++++ config/shlib.conf 2009-07-13 14:49:49.000000000 +0200 +@@ -258,19 +258,13 @@ ;; *-*-freebsd*) @@ -16,15 +16,12 @@ + *) PICFLAGS=-fpic;; + esac SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi ++ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' + LDCOMBINE='ld -Bshareable' diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 10f8cdaec16f..c132c0249ae9 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -7,7 +7,7 @@ PORTNAME= krb5 PORTVERSION= 1.6.3 -PORTREVISION= 6 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ @@ -30,7 +30,7 @@ WITH_OPENSSL_PORT= yes USE_GMAKE= yes USE_PERL5_BUILD= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared # CONFIGURE_ARGS+= --disable-thread-support CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \ diff --git a/security/krb5/files/patch-config::shlib.conf b/security/krb5/files/patch-config::shlib.conf index 18f91fffc6d5..5d680b5487ca 100644 --- a/security/krb5/files/patch-config::shlib.conf +++ b/security/krb5/files/patch-config::shlib.conf @@ -1,6 +1,6 @@ ---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006 -+++ config/shlib.conf Wed Mar 28 17:17:55 2007 -@@ -258,22 +258,15 @@ +--- config/shlib.conf.orig 2009-07-13 14:48:25.000000000 +0200 ++++ config/shlib.conf 2009-07-13 14:49:49.000000000 +0200 +@@ -258,19 +258,13 @@ ;; *-*-freebsd*) @@ -16,15 +16,12 @@ + *) PICFLAGS=-fpic;; + esac SHLIBVEXT='.so.$(LIBMAJOR)' -+ LDCOMBINE="libtool --mode=link cc -shared" RPATH_FLAG='-Wl,-rpath -Wl,' - else - RPATH_FLAG=-R - SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' - fi ++ CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)' SHLIBEXT=.so -- LDCOMBINE='ld -Bshareable' - SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)' - CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)' - RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;' + LDCOMBINE='ld -Bshareable' diff --git a/security/kssh/Makefile b/security/kssh/Makefile index 28085e305f86..5eb0899efa85 100644 --- a/security/kssh/Makefile +++ b/security/kssh/Makefile @@ -16,7 +16,7 @@ MAINTAINER= kevlo@FreeBSD.org COMMENT= KDE frontend to ssh USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes .include <bsd.port.mk> diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index e801a6abccbf..f2b1a7539f7e 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -16,7 +16,7 @@ COMMENT= General purpose crypto library based on code used in GnuPG LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" USE_LDCONFIG= yes diff --git a/security/libgnomesu/Makefile b/security/libgnomesu/Makefile index 87ca059d9961..8f0ce6282dfc 100644 --- a/security/libgnomesu/Makefile +++ b/security/libgnomesu/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://members.chello.nl/~h.lai/libgnomesu/ MAINTAINER= ports@FreeBSD.org COMMENT= Library and frontend for running commands as root -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix libgnomeui CONFIGURE_ARGS+=--disable-install-pam diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile index 97d2d1cfbbbe..2a5e2f01bd37 100644 --- a/security/libgpg-error/Makefile +++ b/security/libgpg-error/Makefile @@ -15,7 +15,7 @@ MAINTAINER= novel@FreeBSD.org COMMENT= Common error values for all GnuPG components USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= ltverhack USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile index 6516cadd0c84..7fe45e29f5bb 100644 --- a/security/libgringotts/Makefile +++ b/security/libgringotts/Makefile @@ -17,7 +17,7 @@ COMMENT= Library for encapsulating/safekeeping data in encrypted/compressed form LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ mhash.2:${PORTSDIR}/security/mhash -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" CPPFLAGS="-I${LOCALBASE}/include" diff --git a/security/libident/Makefile b/security/libident/Makefile index bb2f39c9b8e1..23abc6e281bf 100644 --- a/security/libident/Makefile +++ b/security/libident/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.remlab.net/files/libident/ MAINTAINER= ports@FreeBSD.org COMMENT= A small library to interface the ident protocol server (rfc1413) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget lthack GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile index 69d9451e80e8..7a331e8d7f26 100644 --- a/security/libmcrypt/Makefile +++ b/security/libmcrypt/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//} MAINTAINER= ports@FreeBSD.org COMMENT= Multi-cipher cryptographic library (used in PHP) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-static MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes diff --git a/security/libntlm/Makefile b/security/libntlm/Makefile index 8cb7d7b2fcba..19a8b9f8eed2 100644 --- a/security/libntlm/Makefile +++ b/security/libntlm/Makefile @@ -15,7 +15,7 @@ MAINTAINER= jochen@daten-chaos.de COMMENT= A library that implement Microsoft's NTLM authentication USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAKE_JOBS_SAFE= yes diff --git a/security/libotr/Makefile b/security/libotr/Makefile index bae1ed521c15..7401716c7d00 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= gpg-error.0:${PORTSDIR}/security/libgpg-error \ MAKE_JOBS_SAFE= yes USE_GNOME= pkgconfig -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_LDCONFIG= yes MAN1= otr_toolkit.1 diff --git a/security/libp11/Makefile b/security/libp11/Makefile index a2957a09daf2..f0f9f761c7f0 100644 --- a/security/libp11/Makefile +++ b/security/libp11/Makefile @@ -7,13 +7,14 @@ PORTNAME= libp11 PORTVERSION= 0.2.5 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ MAINTAINER= ale@FreeBSD.org COMMENT= A small layer on top of PKCS\#11 API -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig diff --git a/security/nessus-libnasl/Makefile b/security/nessus-libnasl/Makefile index 32a6578c1cca..054d756126a7 100644 --- a/security/nessus-libnasl/Makefile +++ b/security/nessus-libnasl/Makefile @@ -24,7 +24,7 @@ LIB_DEPENDS= nessus.4:${PORTSDIR}/security/nessus-libraries DIST_SUBDIR= nessus WRKSRC= ${WRKDIR}/libnasl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build GNU_CONFIGURE= yes USE_LDCONFIG= YES diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index 2f724e88a060..a6007e40f8fa 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -26,7 +26,7 @@ DIST_SUBDIR= nessus WRKSRC= ${WRKDIR}/nessus-libraries USE_BISON= build -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-cipher .if defined(WITH_NESSUS_BPF_SHARE) CONFIGURE_ARGS+= --enable-bpf-sharing diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile index 1ada37478f24..541e6e9291b2 100644 --- a/security/opencdk/Makefile +++ b/security/opencdk/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-libgcrypt-prefix=${LOCALBASE} DOCS= AUTHORS NEWS README THANKS doc/opencdk-api.html diff --git a/security/openct/Makefile b/security/openct/Makefile index a09f1aa20df3..62672b11d879 100644 --- a/security/openct/Makefile +++ b/security/openct/Makefile @@ -7,6 +7,7 @@ PORTNAME= openct PORTVERSION= 0.6.17 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \ http://www.opensc-project.org/files/${PORTNAME}/testing/ @@ -16,7 +17,7 @@ COMMENT= A middleware framework for smart card terminals OPTIONS= PCSC "Enable PC/SC support" off -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= pkgconfig diff --git a/security/opensaml/Makefile b/security/opensaml/Makefile index 23da408169cc..01b9d0b55e96 100644 --- a/security/opensaml/Makefile +++ b/security/opensaml/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl \ xml-security-c.14:${PORTSDIR}/security/apache-xml-security-c GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/security/opensc/Makefile b/security/opensc/Makefile index bac4a7aa3c21..067aa0dc0e38 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -7,6 +7,7 @@ PORTNAME= opensc PORTVERSION= 0.11.9 +PORTREVISION= 1 CATEGORIES= security devel MASTER_SITES= http://www.opensc-project.org/files/${PORTNAME}/ \ http://www.opensc-project.org/files/${PORTNAME}/testing/ @@ -18,7 +19,7 @@ OPTIONS= OPENCT "Enable direct OpenCT backend support" on \ PCSC "Enable PC/SC backend support" off \ SIGNER "Enable signer browser plugin" off -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_ICONV= yes USE_OPENSSL= yes USE_GMAKE= yes diff --git a/security/openscep/Makefile b/security/openscep/Makefile index 5f2ce3a48624..10cf2e16b05d 100644 --- a/security/openscep/Makefile +++ b/security/openscep/Makefile @@ -16,7 +16,7 @@ COMMENT= Open source scep server MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes USE_OPENLDAP= yes USE_APACHE= 1.3+ diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile index 4e3216382e0b..7a623dc91e1e 100644 --- a/security/pam-mysql/Makefile +++ b/security/pam-mysql/Makefile @@ -17,7 +17,7 @@ COMMENT= A pam module for authenticating with MySQL USE_MYSQL= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal:14 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:14 autoconf:262 libtool:22 ACLOCAL_ARGS= -I ${PREFIX}/share/aclocal CONFIGURE_ARGS= --with-mysql=${LOCALBASE} --with-pam-mods-dir=${PREFIX}/lib --with-pam=/usr diff --git a/security/pam_authsrv/Makefile b/security/pam_authsrv/Makefile index a0d9babef6a0..e627417083cd 100644 --- a/security/pam_authsrv/Makefile +++ b/security/pam_authsrv/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/security/fwtk:build RESTRICTED= No form of redistribution is allowed, because of linkging against fwtk -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -L${PORTSDIR}/security/fwtk/work/fwtk" \ CFLAGS="${CFLAGS} -I${PORTSDIR}/security/fwtk/work/fwtk" CONFIGURE_ARGS= --disable-encap --disable-epkg-install diff --git a/security/pam_p11/Makefile b/security/pam_p11/Makefile index 3443ed9bd956..79d920da44f7 100644 --- a/security/pam_p11/Makefile +++ b/security/pam_p11/Makefile @@ -16,7 +16,7 @@ COMMENT= A PAM module using crypto tokens for auth LIB_DEPENDS= p11.3:${PORTSDIR}/security/libp11 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GNOME= pkgconfig diff --git a/security/pam_per_user/Makefile b/security/pam_per_user/Makefile index 3f324f83eca9..013ad17b9ff3 100644 --- a/security/pam_per_user/Makefile +++ b/security/pam_per_user/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.feep.net/pub/software/PAM/pam_per_user/ MAINTAINER= pirzyk@FreeBSD.org COMMENT= PAM module for per-user authentication -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN5= pam_per_user.5 diff --git a/security/pam_pseudo/Makefile b/security/pam_pseudo/Makefile index 66ba277253d7..2ee118366e3d 100644 --- a/security/pam_pseudo/Makefile +++ b/security/pam_pseudo/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.feep.net/pub/software/PAM/pam_pseudo/ MAINTAINER= pirzyk@FreeBSD.org COMMENT= PAM module for per-user authentication -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-encap --disable-epkg-install INSTALL_TARGET= install-real diff --git a/security/shishi/Makefile b/security/shishi/Makefile index a475176ad539..2ec33864b6d3 100644 --- a/security/shishi/Makefile +++ b/security/shishi/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn \ tasn1.4:${PORTSDIR}/security/libtasn1 \ gcrypt.16:${PORTSDIR}/security/libgcrypt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5_BUILD= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_ICONV= yes diff --git a/security/snort/Makefile b/security/snort/Makefile index 73f3f1a3bcae..28608878c2ce 100644 --- a/security/snort/Makefile +++ b/security/snort/Makefile @@ -58,7 +58,7 @@ LIBNET_LIBDIR= ${LIBNET_LIBS:M-L*:S/-L//} .endif .if !defined(WITHOUT_DYNAMIC) -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --enable-dynamicplugin PLIST_SUB+= DYNAMIC="" diff --git a/security/steghide/Makefile b/security/steghide/Makefile index 1c62f4199a09..c9fec5c40593 100644 --- a/security/steghide/Makefile +++ b/security/steghide/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \ USE_GETTEXT= yes USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -fpermissive" \ LIBS="-L${LOCALBASE}/lib -lintl -lmcrypt" diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 8c4097be25ce..ce93d8426ca2 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -16,7 +16,7 @@ MASTER_SITES= http://www.stunnel.org/download/stunnel/src/ \ MAINTAINER= roam@FreeBSD.org COMMENT= SSL encryption wrapper for standard network daemons -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_OPENSSL= YES USE_RC_SUBR= stunnel diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile index 446e58a4d865..49941f6a353d 100644 --- a/security/tor-devel/Makefile +++ b/security/tor-devel/Makefile @@ -20,7 +20,7 @@ COMMENT= An anonymizing overlay network for TCP RUN_DEPENDS= tsocks:${PORTSDIR}/net/tsocks LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent -USE_AUTOTOOLS= libtool:15 aclocal:110 autoconf:262 +USE_AUTOTOOLS= libtool:22 aclocal:110 autoconf:262 GNU_CONFIGURE= yes USE_OPENSSL= yes diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile index a11977ae56da..d742e08096ac 100644 --- a/sysutils/adtool/Makefile +++ b/sysutils/adtool/Makefile @@ -16,7 +16,7 @@ COMMENT= Active Directory administration tool USE_GMAKE= yes USE_OPENLDAP= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile index 2195d38db115..c489756ae7b6 100644 --- a/sysutils/am-utils/Makefile +++ b/sysutils/am-utils/Makefile @@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Berkeley Automounter Suite of Utilities USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PORTDOCS= AUTHORS BUGS COPYING FAQ NEWS README.attrcache diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile index c3af40ea0387..00cee35ca476 100644 --- a/sysutils/dar/Makefile +++ b/sysutils/dar/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF MAINTAINER= jadawin@FreeBSD.org COMMENT= A full featured command-line backup tool, aimed for disks -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/sysutils/eiciel/Makefile b/sysutils/eiciel/Makefile index 1321f9dcd1f0..dd22d096c4c6 100644 --- a/sysutils/eiciel/Makefile +++ b/sysutils/eiciel/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-nautilus-extensions-dir=${PREFIX}/lib/nautilus/extensions-2.0 diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile index 78c05c584dcb..2870aae46bc4 100644 --- a/sysutils/file/Makefile +++ b/sysutils/file/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.astron.com/pub/file/ \ MAINTAINER= jharris@widomaker.com COMMENT= Utility to determine file type -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS+= --enable-fsect-man5 diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile index f12aaabf4672..39e3f57ced53 100644 --- a/sysutils/filelight-kde4/Makefile +++ b/sysutils/filelight-kde4/Makefile @@ -15,7 +15,7 @@ MAINTAINER= decept0@gmail.com COMMENT= Represent a file system as a set of concentric segmented-rings USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile index f12aaabf4672..39e3f57ced53 100644 --- a/sysutils/filelight/Makefile +++ b/sysutils/filelight/Makefile @@ -15,7 +15,7 @@ MAINTAINER= decept0@gmail.com COMMENT= Represent a file system as a set of concentric segmented-rings USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile index 89c1342e781e..c85101ce029c 100644 --- a/sysutils/freeipmi/Makefile +++ b/sysutils/freeipmi/Makefile @@ -27,7 +27,7 @@ COMMENT= Library and tools to support IPMI-capable hardware BUILD_DEPENDS+= ${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile index 7cb284a8bb6c..28dcf163af1d 100644 --- a/sysutils/fusefs-encfs/Makefile +++ b/sysutils/fusefs-encfs/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fuse.h:${PORTSDIR}/sysutils/fusefs-libs WRKSRC= ${WRKDIR}/encfs-${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-boost-serialization=boost_serialization CONFIGURE_ENV= LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile index 8c5ca8e1e0d8..8ea17170a7ae 100644 --- a/sysutils/fusefs-ntfs/Makefile +++ b/sysutils/fusefs-ntfs/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= fuse.2:${PORTSDIR}/sysutils/fusefs-libs RUN_DEPENDS= ${LOCALBASE}/modules/fuse.ko:${PORTSDIR}/sysutils/fusefs-kmod USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes CONFIGURE_ARGS= --exec-prefix=${PREFIX} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/ganglia-monitor-core/Makefile b/sysutils/ganglia-monitor-core/Makefile index 91e1e2a6b4c1..e0508785e8d8 100644 --- a/sysutils/ganglia-monitor-core/Makefile +++ b/sysutils/ganglia-monitor-core/Makefile @@ -28,7 +28,7 @@ PKGINSTALL= ${WRKDIR}/pkg-install OPTIONS+= GMETAD "include gmetad" on USE_PYTHON= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure libmetrics/configure GNU_CONFIGURE= yes diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile index 47d210713e99..aa9ff2fd6285 100644 --- a/sysutils/geomgui/Makefile +++ b/sysutils/geomgui/Makefile @@ -18,7 +18,7 @@ COMMENT= Viewer for kernel geom layer LIB_DEPENDS= gvc:${PORTSDIR}/graphics/graphviz -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 librsvg2 USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/sysutils/gkleds2/Makefile b/sysutils/gkleds2/Makefile index c878f736689a..c5ac4071bc48 100644 --- a/sysutils/gkleds2/Makefile +++ b/sysutils/gkleds2/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 USE_XORG= x11 xtst USE_GNOME= gnometarget gtk20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnome-device-manager/Makefile b/sysutils/gnome-device-manager/Makefile index 1e8f32a0ba6e..cf248e97e194 100644 --- a/sysutils/gnome-device-manager/Makefile +++ b/sysutils/gnome-device-manager/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack gnometarget intlhack ltverhack libgnomeui -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_LDCONFIG= yes INSTALLS_OMF= yes diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 039fd75aa049..ec4068a88b66 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -29,7 +29,7 @@ USE_BZIP2= yes USE_GMAKE= yes INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GSTREAMER= good USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui libwnck \ gnomedocutils gnomepanel diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile index 6167491d2b18..cf5be7c91975 100644 --- a/sysutils/gnome-system-tools/Makefile +++ b/sysutils/gnome-system-tools/Makefile @@ -25,7 +25,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomehack gnomeprefix intlhack nautilus2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_OMF= yes CONFIGURE_ARGS= --enable-services CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile index c2ef32c5c0af..71d618419250 100644 --- a/sysutils/gsmartcontrol/Makefile +++ b/sysutils/gsmartcontrol/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24 \ pcre:${PORTSDIR}/devel/pcre RUN_DEPENDS= ${LOCALBASE}/sbin/smartctl:${PORTSDIR}/sysutils/smartmontools -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= pkgconfig INSTALLS_ICONS= yes diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index 80c30d2d19eb..a0ed228cd194 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pciids/pci.ids:${PORTSDIR}/misc/pciids USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack intlhack ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_PYTHON= yes CONFIGURE_ARGS= --disable-gtk-doc \ diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index 55adb87faf2f..420a8c101fda 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -7,6 +7,7 @@ PORTNAME= heartbeat PORTVERSION= 2.1.4 +PORTREVISION= 1 CATEGORIES= sysutils #MASTER_SITES= http://hg.linux-ha.org/lha-2.1/archive/STABLE-2.1.4.tar.bz2 MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -21,9 +22,10 @@ LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ net-1.1.3:${PORTSDIR}/net/libnet-devel \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid \ xml2:${PORTSDIR}/textproc/libxml2 -PATCH_DEPENDS= ${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool15 +PATCH_DEPENDS= ${LOCALBASE}/bin/libtoolize:${PORTSDIR}/devel/libtool22 -USE_AUTOTOOLS= autoconf:262 autoheader:262 automake:110 aclocal:110 libtool:15 +USE_AUTOTOOLS= autoconf:262 autoheader:262 automake:110 aclocal:110 \ + libtool:22 libltdl:22 AUTOMAKE_ARGS+= --add-missing --include-deps --copy ACLOCAL_ARGS+= -I ${LOCALBASE}/share/aclocal @@ -36,8 +38,8 @@ USE_PYTHON= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libnet113" \ - LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib/libnet113" +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/libnet113" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/libnet113" CONFIGURE_ARGS= --prefix=${PREFIX} \ --localstatedir=/var \ @@ -70,7 +72,7 @@ BATCH=NO .if defined(WITH_MGMT) BUILD_DEPENDS+= swig:${PORTSDIR}/devel/swig13 -RUN_DEPENDS+= py-gtk2:${PORTSDIR}/x11-toolkits/py-gtk2 +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2 PLIST_SUB+= MGMT="" .else CONFIGURE_ARGS+= --disable-mgmt diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile index 98b9bdc67e3c..ad6b93e81efd 100644 --- a/sysutils/htop/Makefile +++ b/sysutils/htop/Makefile @@ -19,7 +19,7 @@ NOT_FOR_ARCHS= sparc64 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-proc=/compat/linux/proc --enable-unicode -USE_AUTOTOOLS= autoconf:262 aclocal:19 automake:19 libtool:15 +USE_AUTOTOOLS= autoconf:262 aclocal:19 automake:19 libtool:22 ACLOCAL_ARGS= -I ${ACLOCAL_DIR} USE_PYTHON_BUILD= yes diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index b36e27c53fc2..2f9dedd7f625 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ samplerate:${PORTSDIR}/audio/libsamplerate USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal USE_GMAKE= yes USE_CDRTOOLS= yes diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index b36e27c53fc2..2f9dedd7f625 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= tag:${PORTSDIR}/audio/taglib \ samplerate:${PORTSDIR}/audio/libsamplerate USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-k3bsetup=no --without-resmgr --without-hal USE_GMAKE= yes USE_CDRTOOLS= yes diff --git a/sysutils/kcpuload/Makefile b/sysutils/kcpuload/Makefile index 29d278755472..194b1b6de9a5 100644 --- a/sysutils/kcpuload/Makefile +++ b/sysutils/kcpuload/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CPU meter for Kicker USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \ diff --git a/sysutils/kcube/Makefile b/sysutils/kcube/Makefile index 0410010709c0..f005752fb6e0 100644 --- a/sysutils/kcube/Makefile +++ b/sysutils/kcube/Makefile @@ -15,7 +15,7 @@ MAINTAINER= michael@ranner.eu COMMENT= Another cpu load kicker applet for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile index b5f068dc2be6..43574a62b844 100644 --- a/sysutils/kdeadmin3/Makefile +++ b/sysutils/kdeadmin3/Makefile @@ -22,7 +22,7 @@ PREFIX= ${KDE_PREFIX} USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile index 5e6581cb65ef..93cab2e3e74b 100644 --- a/sysutils/kdirstat/Makefile +++ b/sysutils/kdirstat/Makefile @@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-configure USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/sysutils/keep/Makefile b/sysutils/keep/Makefile index e31ee751896a..033ff05eed21 100644 --- a/sysutils/keep/Makefile +++ b/sysutils/keep/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= rdiff-backup:${PORTSDIR}/sysutils/rdiff-backup GNU_CONFIGURE= yes USE_GMAKE= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes diff --git a/sysutils/kkbswitch/Makefile b/sysutils/kkbswitch/Makefile index 17dad03f9337..3e9c057f06d9 100644 --- a/sysutils/kkbswitch/Makefile +++ b/sysutils/kkbswitch/Makefile @@ -18,7 +18,7 @@ EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure USE_KDELIBS_VER= 3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS += --with-qt-dir=${QT_PREFIX} \ --with-extra-includes=${LOCALBASE}/include \ diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile index 3d59b7fb46ce..e0fc02ff8f12 100644 --- a/sysutils/kkeyled/Makefile +++ b/sysutils/kkeyled/Makefile @@ -16,7 +16,7 @@ COMMENT= Panel applet to display the keyboard's LED states USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/sysutils/klaptopdaemon/Makefile b/sysutils/klaptopdaemon/Makefile index 6c6c4c0f9bbe..0744cd4ea402 100644 --- a/sysutils/klaptopdaemon/Makefile +++ b/sysutils/klaptopdaemon/Makefile @@ -25,7 +25,7 @@ USE_KDELIBS_VER=3 ONLY_FOR_ARCHS= i386 USE_XORG= xtst xscrnsaver USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION} diff --git a/sysutils/klineakconfig/Makefile b/sysutils/klineakconfig/Makefile index ee3690d401ab..ba455c2c584f 100644 --- a/sysutils/klineakconfig/Makefile +++ b/sysutils/klineakconfig/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd USE_KDELIBS_VER=3 USE_XORG= xkbfile USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${TOUCH} ${WRKSRC}/config.h.in diff --git a/sysutils/kmilo/Makefile b/sysutils/kmilo/Makefile index ebb6bb9b0514..774c9f3829f5 100644 --- a/sysutils/kmilo/Makefile +++ b/sysutils/kmilo/Makefile @@ -23,7 +23,7 @@ PREFIX= ${KDE_PREFIX} ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeutils-${PORTVERSION} diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile index d334df0b9472..0db07fe1501c 100644 --- a/sysutils/knutclient-kde4/Makefile +++ b/sysutils/knutclient-kde4/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= automake>=0:${PORTSDIR}/devel/automake19 USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-fast-perl --enable-mt --program-transform-name='' post-patch: diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile index d334df0b9472..0db07fe1501c 100644 --- a/sysutils/knutclient/Makefile +++ b/sysutils/knutclient/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= automake>=0:${PORTSDIR}/devel/automake19 USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-fast-perl --enable-mt --program-transform-name='' post-patch: diff --git a/sysutils/komparator/Makefile b/sysutils/komparator/Makefile index 985fb2a61520..dd870ef7d15b 100644 --- a/sysutils/komparator/Makefile +++ b/sysutils/komparator/Makefile @@ -16,7 +16,7 @@ COMMENT= KDE app that searches and synchronizes two directories USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GETTEXT= yes diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile index d60dfed70818..d4f7835b02ec 100644 --- a/sysutils/krename/Makefile +++ b/sysutils/krename/Makefile @@ -17,7 +17,7 @@ COMMENT= Very powerful batch file renamer for KDE3 USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile index cd572804c6ce..dc8fc83f73fe 100644 --- a/sysutils/kshutdown-kde4/Makefile +++ b/sysutils/kshutdown-kde4/Makefile @@ -16,7 +16,7 @@ COMMENT= Advanced shutdown utility for KDE USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile index cd572804c6ce..dc8fc83f73fe 100644 --- a/sysutils/kshutdown/Makefile +++ b/sysutils/kshutdown/Makefile @@ -16,7 +16,7 @@ COMMENT= Advanced shutdown utility for KDE USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/sysutils/ksynaptics/Makefile b/sysutils/ksynaptics/Makefile index c359f6cc3ff8..bd91c965eadf 100644 --- a/sysutils/ksynaptics/Makefile +++ b/sysutils/ksynaptics/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= synaptics:${PORTSDIR}/x11/libsynaptics USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile index 81a2ae39c18c..e9aa919c04d2 100644 --- a/sysutils/lineak-defaultplugin/Makefile +++ b/sysutils/lineak-defaultplugin/Makefile @@ -18,7 +18,7 @@ COMMENT= Default plugins for lineakd LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_XORG= x11 xext xt xtst xfixes USE_GMAKE= yes diff --git a/sysutils/lineak-kdeplugins/Makefile b/sysutils/lineak-kdeplugins/Makefile index 4e8319c6cf12..7118d70e2d31 100644 --- a/sysutils/lineak-kdeplugins/Makefile +++ b/sysutils/lineak-kdeplugins/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= lineak.8:${PORTSDIR}/sysutils/lineakd USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS+= --program-prefix='' diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile index 9dffedb6d7e9..87523402e1b0 100644 --- a/sysutils/lineakd/Makefile +++ b/sysutils/lineakd/Makefile @@ -18,7 +18,7 @@ COMMENT= Lineakd is a daemon which enables special keys on internet keyboards USE_GMAKE= yes USE_XORG= x11 xext xt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index 4ab773a62985..78684e9dfca4 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -29,7 +29,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack nautilus2 ltverhack \ desktopfileutils ltasneededhack eel2 USE_CDRTOOLS= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/progsreiserfs/Makefile b/sysutils/progsreiserfs/Makefile index 149c13c8e21a..1561c33866bb 100644 --- a/sysutils/progsreiserfs/Makefile +++ b/sysutils/progsreiserfs/Makefile @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/} MAINTAINER= ports@FreeBSD.org COMMENT= Utilities and library to manipulate ReiserFS partitions -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-debug --disable-Werror CFLAGS+= -Dgetopt_long_only=getopt_long diff --git a/sysutils/pwg/Makefile b/sysutils/pwg/Makefile index 63f7f5c6c39d..8bbfb35c405e 100644 --- a/sysutils/pwg/Makefile +++ b/sysutils/pwg/Makefile @@ -18,7 +18,7 @@ COMMENT= A small tool to generate secure, random passwords USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes post-patch: diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile index 346c0aec5fe0..cb878a64dd9c 100644 --- a/sysutils/torque/Makefile +++ b/sysutils/torque/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.clusterresources.com/downloads/torque/ MAINTAINER= trasz@FreeBSD.org COMMENT= Open source resource manager -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-rcp=scp USE_GMAKE= yes diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index b97bbd24a413..d859c2ebbb29 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -39,7 +39,7 @@ USE_GETTEXT= yes USE_LDCONFIG= yes USE_GSTREAMER= core INSTALLS_ICONS= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_ARGS= --enable-video-extractor=gstreamer \ diff --git a/sysutils/userinfo/Makefile b/sysutils/userinfo/Makefile index aed96d76be0f..f0e460d27287 100644 --- a/sysutils/userinfo/Makefile +++ b/sysutils/userinfo/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= bjk MAINTAINER= ports@FreeBSD.org COMMENT= Show information about local users -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes MAN1= ui.1 diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile index 93e8f078353a..c433ce3fd05d 100644 --- a/sysutils/xfsprogs/Makefile +++ b/sysutils/xfsprogs/Makefile @@ -19,7 +19,7 @@ COMMENT= A set of utilities and library to manipulate an xfs filesystem USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= autoconf:262 libtool:15:env +USE_AUTOTOOLS= autoconf:262 libtool:22:env GNU_CONFIGURE= yes CONFIGURE_ENV+= INSTALL="${INSTALL} ${_BINOWNGRP}" \ CFLAGS="${CFLAGS}" \ diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile index 9f011b1c2492..986c827544d8 100644 --- a/textproc/aiksaurus/Makefile +++ b/textproc/aiksaurus/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= aiksaurus MAINTAINER?= gnome@FreeBSD.org COMMENT?= A set of libraries and applications which provide a thesaurus -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME?= gnomehack gnometarget USE_LDCONFIG= yes diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index 9c8fea8f31a5..2cf35f54e290 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -18,7 +18,7 @@ COMMENT= CLucene is a C++ port of Lucene GNU_CONFIGURE= yes USE_BZIP2= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.pre.mk> diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile index ef384bb3ecec..64406908c4c9 100644 --- a/textproc/cole/Makefile +++ b/textproc/cole/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= sobomax MAINTAINER= ports@FreeBSD.org COMMENT= A free C OLE library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile index ea5ea4fc9ce7..82c0e3dd2f46 100644 --- a/textproc/dict/Makefile +++ b/textproc/dict/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= dict INSTALL_TARGET= install.dict MAN1= dict.1 dictl.1 diff --git a/textproc/dictfmt/Makefile b/textproc/dictfmt/Makefile index bc74ad85b28d..ae5d7e185a02 100644 --- a/textproc/dictfmt/Makefile +++ b/textproc/dictfmt/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-cflags="${CFLAGS}" ALL_TARGET= dictfmt INSTALL_TARGET= install.dictfmt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= dictfmt.1 dictfmt_index2suffix.1 dictfmt_index2word.1 \ dictunformat.1 diff --git a/textproc/ekhtml/Makefile b/textproc/ekhtml/Makefile index df4c0e7d91dd..ca6d120ecbb4 100644 --- a/textproc/ekhtml/Makefile +++ b/textproc/ekhtml/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= SF MAINTAINER= miwi@FreeBSD.org COMMENT= El-Kabong is a speedy, yet forgiving, SAX-style HTML parser -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index 03e7bacf943e..c753c5bc76e5 100644 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -16,7 +16,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Dictionary/spellchecking framework USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack gnometarget glib20 ltverhack CONFIGURE_ARGS= --disable-hspell \ diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index eccfafd2589e..ddc80acdac7f 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -16,7 +16,7 @@ COMMENT= A port of Adobe XMP SDK to work on UNIX LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= ltverhack gnomehack gnometarget CONFIGURE_ARGS= --enable-unittest=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile index 0aed3e36fd33..0ef7edc345a6 100644 --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -16,7 +16,7 @@ COMMENT= Gnome DOM Engine LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= glib20 gnomehack GNU_CONFIGURE= yes CONFIGURE_ENV= GLIB_CONFIG="${LOCALBASE}/bin/pkg-config glib-2.0" \ diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index dd7f4d5355c0..38209615691d 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -23,7 +23,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gtk20 intlhack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/iiimf-client-lib/Makefile b/textproc/iiimf-client-lib/Makefile index 3627d20aca77..42b10146cb11 100644 --- a/textproc/iiimf-client-lib/Makefile +++ b/textproc/iiimf-client-lib/Makefile @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS= i386 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/iiimcf diff --git a/textproc/iiimf-csconv/Makefile b/textproc/iiimf-csconv/Makefile index 2c944a4c97d9..21ce8f894686 100644 --- a/textproc/iiimf-csconv/Makefile +++ b/textproc/iiimf-csconv/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_ICONV= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/CSConv diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile index 7e9282db1457..7b0ff60f0907 100644 --- a/textproc/iiimf-gnome-im-switcher/Makefile +++ b/textproc/iiimf-gnome-im-switcher/Makefile @@ -25,7 +25,7 @@ USE_GNOME= intltool gconf2 libglade2 libgnomeui \ gnomepanel gnomeprefix gnomehack INSTALLS_OMF= yes INSTALLS_ICONS= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env GCONF_SCHEMAS= gnome-im-properties.schemas gnome-im-switcher.schemas diff --git a/textproc/iiimf-gtk/Makefile b/textproc/iiimf-gtk/Makefile index a63c9136ffe0..6c308523791f 100644 --- a/textproc/iiimf-gtk/Makefile +++ b/textproc/iiimf-gtk/Makefile @@ -26,7 +26,7 @@ USE_ICONV= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= intltool gtk20 -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimgcf diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile index 12656f594408..3509ae905cd5 100644 --- a/textproc/iiimf-le-unit/Makefile +++ b/textproc/iiimf-le-unit/Makefile @@ -27,7 +27,7 @@ USE_ICONV= yes USE_GMAKE= yes USE_GNOME= libxml2 USE_XORG= x11 -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/leif diff --git a/textproc/iiimf-protocol-lib/Makefile b/textproc/iiimf-protocol-lib/Makefile index c20aaa1d2289..5b6480b508be 100644 --- a/textproc/iiimf-protocol-lib/Makefile +++ b/textproc/iiimf-protocol-lib/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= i386 USE_LDCONFIG= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/lib/iiimp diff --git a/textproc/iiimf-server/Makefile b/textproc/iiimf-server/Makefile index 52076de9ff9a..aa08cf286ae6 100644 --- a/textproc/iiimf-server/Makefile +++ b/textproc/iiimf-server/Makefile @@ -26,7 +26,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= pkgconfig libxml2 USE_OPENSSL= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimsf diff --git a/textproc/iiimf-x-lib/Makefile b/textproc/iiimf-x-lib/Makefile index aa58fdb9414f..d9b1da2a0325 100644 --- a/textproc/iiimf-x-lib/Makefile +++ b/textproc/iiimf-x-lib/Makefile @@ -27,7 +27,7 @@ USE_GETTEXT= yes USE_GMAKE= yes USE_MOTIF= yes USE_OPENSSL= yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimxcf/xiiimp.so diff --git a/textproc/iiimf-x/Makefile b/textproc/iiimf-x/Makefile index b27e25b05e5f..5c0685edb1de 100644 --- a/textproc/iiimf-x/Makefile +++ b/textproc/iiimf-x/Makefile @@ -25,7 +25,7 @@ ONLY_FOR_ARCHS= i386 USE_BZIP2= yes USE_GMAKE= yes USE_XORG= x11 ice xt -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env WRKSRC= ${WRKDIR}/${DISTNAME:S/src-//} BUILDDIR= ${WRKSRC}/iiimxcf/htt_xbe diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile index ab00afba157c..f768c4da5668 100644 --- a/textproc/iksemel/Makefile +++ b/textproc/iksemel/Makefile @@ -16,7 +16,7 @@ COMMENT= XML parser library mainly designed for Jabber applications LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile index 6ec7fefb93bb..8ba3135253a1 100644 --- a/textproc/jade/Makefile +++ b/textproc/jade/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr CONFLICTS= sp-1.* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/textproc/kbedic/Makefile b/textproc/kbedic/Makefile index 0e0db29210d4..8ae97e953d03 100644 --- a/textproc/kbedic/Makefile +++ b/textproc/kbedic/Makefile @@ -16,7 +16,7 @@ MAINTAINER= roam@FreeBSD.org COMMENT= An English-Bulgarian-English dictionary USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --with-kde CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}" USE_KDELIBS_VER= 3 diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 8bdef76846da..42893e88892f 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -16,7 +16,7 @@ MAINTAINER= h.eichmann@gmx.de COMMENT= A KDE3 graphical frontend for diff USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes INSTALLS_ICONS= yes USE_LDCONFIG= ${PREFIX}/lib/kde3 diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile index 850a8b60b82d..849a61d9385f 100644 --- a/textproc/libcroco/Makefile +++ b/textproc/libcroco/Makefile @@ -15,7 +15,7 @@ COMMENT= CSS2 parsing library USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack glib20 libxml2 ltverhack diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile index 3f5af8e655c6..a1e417554f89 100644 --- a/textproc/libextractor/Makefile +++ b/textproc/libextractor/Makefile @@ -7,7 +7,7 @@ PORTNAME= libextractor PORTVERSION= 0.5.20b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= http://gnunet.org/libextractor/download/ @@ -18,7 +18,7 @@ LIB_DEPENDS= mpeg2:${PORTSDIR}/multimedia/libmpeg2 USE_GNOME= glib20 USE_PYTHON= yes -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 USE_DOS2UNIX= yes GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/libextractor diff --git a/textproc/liblingoteach/Makefile b/textproc/liblingoteach/Makefile index 40e8a770d020..2c65bd5b6257 100644 --- a/textproc/liblingoteach/Makefile +++ b/textproc/liblingoteach/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= lingoteach MAINTAINER= mva@FreeBSD.org COMMENT= A library for parsing lesson files based on the LingoTeach DTD -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libxml2 GNU_CONFIGURE= yes diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile index 0a865779df6f..90bbf5105fb4 100644 --- a/textproc/liblrdf/Makefile +++ b/textproc/liblrdf/Makefile @@ -17,7 +17,7 @@ COMMENT= Library for manipulating RDF files describing LADSPA plugins BUILD_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa LIB_DEPENDS= raptor.2:${PORTSDIR}/textproc/raptor -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile index 8233c53cb992..d33b0751f9aa 100644 --- a/textproc/libparsifal/Makefile +++ b/textproc/libparsifal/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://www.saunalahti.fi/~samiuus/toni/xmlproc/ MAINTAINER= yzlin@FreeBSD.org COMMENT= Lightweight XML Parser -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/libstree/Makefile b/textproc/libstree/Makefile index 4953ca3598c9..7d9fa0b38c3a 100644 --- a/textproc/libstree/Makefile +++ b/textproc/libstree/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://www.icir.org/christian/downloads/ MAINTAINER= clsung@FreeBSD.org COMMENT= A Generic Suffix Tree Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/textproc/libtextcat/Makefile b/textproc/libtextcat/Makefile index 8d1eb1f40b34..4dedafb7e306 100644 --- a/textproc/libtextcat/Makefile +++ b/textproc/libtextcat/Makefile @@ -18,7 +18,7 @@ MASTER_SITES= http://software.wise-guys.nl/download/ MAINTAINER= thierry@FreeBSD.org COMMENT= Language guessing by N-Gram-Based Text Categorization -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile index 5746786265d4..1ad52fc8b129 100644 --- a/textproc/libtre/Makefile +++ b/textproc/libtre/Makefile @@ -17,7 +17,7 @@ COMMENT= A lightweight fully POSIX compliant regexp matching library USE_BZIP2= yes USE_GNOME= gnomehack gnometarget pkgconfig -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --enable-static CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" USE_LDCONFIG= yes diff --git a/textproc/libuninameslist/Makefile b/textproc/libuninameslist/Makefile index 64a238ea857f..6648d7ab1432 100644 --- a/textproc/libuninameslist/Makefile +++ b/textproc/libuninameslist/Makefile @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GNOME= gnometarget USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 ALL_TARGET= both USE_LDCONFIG= yes diff --git a/textproc/libwps/Makefile b/textproc/libwps/Makefile index 5e2fd4edba28..f3bdead3ebf1 100644 --- a/textproc/libwps/Makefile +++ b/textproc/libwps/Makefile @@ -16,7 +16,7 @@ COMMENT= A Microsoft file word processor format import filter library LIB_DEPENDS= wpd-0.8.8:${PORTSDIR}/textproc/libwpd -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack ltverhack USE_LDCONFIG= yes diff --git a/textproc/libxdiff/Makefile b/textproc/libxdiff/Makefile index 68e8c2d36ce8..f8490acf9ecb 100644 --- a/textproc/libxdiff/Makefile +++ b/textproc/libxdiff/Makefile @@ -17,7 +17,7 @@ COMMENT= Create file differences/patches to both binary and text files WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-static diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile index 1477aae94c7d..655e5f364eee 100644 --- a/textproc/libxml++/Makefile +++ b/textproc/libxml++/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= GNOME MAINTAINER= bland@FreeBSD.org COMMENT= XML API for C++ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget libxml2 pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index 1c38aa19f851..5f53cdb21dd8 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= XML parser library for GNOME -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= pkgconfig GNU_CONFIGURE= yes diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile index 8db806945653..44b353d6f835 100644 --- a/textproc/libxode/Makefile +++ b/textproc/libxode/Makefile @@ -18,7 +18,7 @@ COMMENT= An XML library which wraps expat LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile index 4ff2fe8651cc..7f8744d5ede9 100644 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -15,7 +15,7 @@ COMMENT= A grammar checking library USE_GNOME= gnomehack gnometarget ltverhack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CFLAGS+= ${PTHREAD_CFLAGS} CONFIGURE_ARGS= --enable-pthreads \ diff --git a/textproc/m17n-im-config/Makefile b/textproc/m17n-im-config/Makefile index cca51d25ad48..8a3365142a79 100644 --- a/textproc/m17n-im-config/Makefile +++ b/textproc/m17n-im-config/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= m17n.3:${PORTSDIR}/devel/m17n-lib MAKE_JOBS_UNSAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 intltool intlhack pkgconfig glib20 USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile index bdbba8f3b39d..7f0645ccc71f 100644 --- a/textproc/mifluz/Makefile +++ b/textproc/mifluz/Makefile @@ -16,7 +16,7 @@ COMMENT= C++ library to build and query a full text inverted index USE_GNOME= gnomehack gnometarget USE_BISON= build USE_ICONV= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --without-unac USE_LDCONFIG= yes diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile index ffc32cd53ab2..deae99e8d511 100644 --- a/textproc/minidom/Makefile +++ b/textproc/minidom/Makefile @@ -17,7 +17,7 @@ COMMENT= A minimal implementation of the Document Object Model LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GNOME= glib12 GNU_CONFIGURE= yes diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile index bc733f926b57..b5e5b82d336f 100644 --- a/textproc/modlogan/Makefile +++ b/textproc/modlogan/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns \ pcre.0:${PORTSDIR}/devel/pcre \ expat.6:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes .if defined(WITH_MYSQL) # To quote the author: diff --git a/textproc/mxml/Makefile b/textproc/mxml/Makefile index 706090f3df2c..3504a22ef86d 100644 --- a/textproc/mxml/Makefile +++ b/textproc/mxml/Makefile @@ -16,7 +16,7 @@ COMMENT= Small XML parsing library GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack CONFIGURE_ARGS= --with-docdir=no MAKE_JOBS_SAFE= yes diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile index c5cfb2f44ad6..feebcf760482 100644 --- a/textproc/openvanilla-modules/Makefile +++ b/textproc/openvanilla-modules/Makefile @@ -19,7 +19,7 @@ COMMENT= Input method modules for OpenVanilla BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env USE_GMAKE= yes USE_PERL5_BUILD= yes diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile index 2f31160a2913..6939db9a9ece 100644 --- a/textproc/ots/Makefile +++ b/textproc/ots/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index 1f04e9d99e94..e70e646dd5e0 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -19,7 +19,7 @@ PLIST= ${.CURDIR}/pkg-plist USE_GNOME= gnomehack lthack gnometarget libxslt USE_PYTHON= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ --with-python=${PYTHON_CMD} diff --git a/textproc/rast/Makefile b/textproc/rast/Makefile index 6823ebe18673..dbfa52713a06 100644 --- a/textproc/rast/Makefile +++ b/textproc/rast/Makefile @@ -18,7 +18,7 @@ COMMENT= Full-text search system using N-gram BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= YES USE_BDB= 42 GNU_CONFIGURE= YES diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile index 188cf632ac5b..9d829a0cd744 100644 --- a/textproc/sablotron/Makefile +++ b/textproc/sablotron/Makefile @@ -29,7 +29,7 @@ PLIST_SUB+= SHLIB_MAJOR="${SHLIB_MAJOR}" CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \ LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/textproc/sary/Makefile b/textproc/sary/Makefile index 365939d622c4..b913945196a1 100644 --- a/textproc/sary/Makefile +++ b/textproc/sary/Makefile @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A suffix array library and tools, which provide fast full-text search USE_GNOME= glib20 gnomehack gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= sary.1 mksary.1 diff --git a/textproc/scew/Makefile b/textproc/scew/Makefile index 6db5e6ee25c4..92cf6ecadecd 100644 --- a/textproc/scew/Makefile +++ b/textproc/scew/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 GNU_CONFIGURE= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/scim-input-pad/Makefile b/textproc/scim-input-pad/Makefile index f51124624c11..bc4aacfaacaf 100644 --- a/textproc/scim-input-pad/Makefile +++ b/textproc/scim-input-pad/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile index 6cb38593d4e7..3a1a2060f091 100644 --- a/textproc/scim-kmfl-imengine/Makefile +++ b/textproc/scim-kmfl-imengine/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= kmfl:${PORTSDIR}/textproc/libkmfl RUN_DEPENDS= ${BUILD_DEPENDS} USE_XORG= x11 xkbfile -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 intltool intlhack pkgconfig glib20 USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile index 06db8ef2f446..d671077b5b3f 100644 --- a/textproc/scim-openvanilla/Makefile +++ b/textproc/scim-openvanilla/Makefile @@ -7,7 +7,7 @@ PORTNAME= scim-openvanilla PORTVERSION= 0.7.2.20070514 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= rafan @@ -21,7 +21,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 -USE_AUTOTOOLS= libltdl:15 +USE_AUTOTOOLS= libltdl:22 WRKSRC= ${WRKDIR}/${DISTNAME}/Loaders/SCIM USE_GMAKE= yes USE_GNOME= pkgconfig diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile index 4650955e6e8c..bf26d5667e05 100644 --- a/textproc/scim-table-imengine/Makefile +++ b/textproc/scim-table-imengine/Makefile @@ -19,7 +19,7 @@ COMMENT= SCIM table based input method engine BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim RUN_DEPENDS= ${BUILD_DEPENDS} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_GNOME= intlhack @@ -48,7 +48,7 @@ pre-patch: BUILD_DEPENDS+= skim:${PORTSDIR}/textproc/skim CONFIGURE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" PLIST_SUB= SKIM="" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e "/^DIST_SUBDIRS/s/$$/ skim/" \ -e "/^@SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR =/s/$$/ skim/" \ diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile index 3cc6e6425956..b7bff17bd553 100644 --- a/textproc/scim/Makefile +++ b/textproc/scim/Makefile @@ -16,7 +16,7 @@ COMMENT= Smart Common Input Method platform USE_GNOME= gnomehack gnomehier gtk20 intlhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_ICONV= yes USE_GMAKE= yes USE_XORG= x11 xpm diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index a35c505067db..d7bddaee73fa 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -32,7 +32,7 @@ CONFLICTS= rarian-[0-9]* USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build USE_GNOME= gnomehack gnomehier gnometarget libxslt intlhack USE_LDCONFIG= yes diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile index b44a7cce0c81..0c6370b7c1b7 100644 --- a/textproc/sdcv/Makefile +++ b/textproc/sdcv/Makefile @@ -17,7 +17,7 @@ COMMENT= A text-based utility for work with dictionaries in StarDict's format USE_BZIP2= yes USE_ICONV= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= glib20 SUB_FILES= pkg-message diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile index 5022825447c5..643a7db45080 100644 --- a/textproc/skim/Makefile +++ b/textproc/skim/Makefile @@ -22,7 +22,7 @@ USE_PYTHON= yes USE_BZIP2= yes USE_ICONV= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 PYDISTUTILS_NOEGGINFO= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile index cf0607c88205..a875de1cd0ba 100644 --- a/textproc/soothsayer/Makefile +++ b/textproc/soothsayer/Makefile @@ -17,7 +17,7 @@ BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man USE_GNOME= pkgconfig USE_SQLITE= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ ac_cv_path_CPPUNIT_CONFIG=no \ ac_cv_path_PYTHON=no \ diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile index a3f3159cc01a..95195eb570b8 100644 --- a/textproc/uim-kde/Makefile +++ b/textproc/uim-kde/Makefile @@ -15,7 +15,7 @@ RUN_DEPENDS= uim-pref-qt:${PORTSDIR}/textproc/uim-qt USE_GCC= 4.2+ USE_KDELIBS_VER=3 USE_QT_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile index 05015d674c9e..15a7a4d01467 100644 --- a/textproc/uim-qt/Makefile +++ b/textproc/uim-qt/Makefile @@ -10,7 +10,7 @@ PKGNAMESUFFIX= -qt COMMENT= QT modules of uim input method USE_QT_VER= 3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIB_DEPENDS= uim.6:${PORTSDIR}/textproc/uim diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 76740fadf112..b6d91b6246a9 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -22,7 +22,7 @@ USE_LDCONFIG= yes WANT_GNOME= yes USE_GNOME+= gnometarget glib20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_ICONV= yes USE_PERL5_BUILD=yes diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile index 532f1e324987..83cff40397fb 100644 --- a/textproc/wv/Makefile +++ b/textproc/wv/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx USE_GNOME= gnometarget libgsf USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-png=${LOCALBASE} \ diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile index bee7bd34bd45..e7d97d7aafcb 100644 --- a/textproc/wv2/Makefile +++ b/textproc/wv2/Makefile @@ -16,7 +16,7 @@ COMMENT= A library providing routines to access Microsoft Word files CONFIGURE_ARGS= --with-libiconv=${LOCALBASE} --disable-debug -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnometarget libgsf USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile index 6bda394e7109..c4ea2e3265df 100644 --- a/textproc/xaira/Makefile +++ b/textproc/xaira/Makefile @@ -18,7 +18,8 @@ LIB_DEPENDS= xerces-c:${PORTSDIR}/textproc/xerces-c2 \ icuio:${PORTSDIR}/devel/icu GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:19 autoconf:262 libtool:22 +ACLOCAL_ARGS= -I ${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -I . USE_GMAKE= yes USE_LDCONFIG= yes @@ -49,9 +50,6 @@ post-patch: @${FIND} ${WRKSRC} -name Makefile.am -exec \ ${REINPLACE_CMD} -e 's,^AM_CPPFLAGS.*$$,& $${icu_cppflags},' {} \; -pre-configure: - @${CP} ${LIBTOOL_SHAREDIR}/libltdl/acinclude.m4 ${WRKSRC}/ - post-install: @${CAT} ${PKGMESSAGE} diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile index a2a6c5211ea5..a052c2f43129 100644 --- a/textproc/xls2xml/Makefile +++ b/textproc/xls2xml/Makefile @@ -19,7 +19,7 @@ COMMENT= A utility for converting MS Excel files to XML LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole \ xml.5:${PORTSDIR}/textproc/libxml -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile index 615dc8e8784d..82ade15130c9 100644 --- a/textproc/xmlpp/Makefile +++ b/textproc/xmlpp/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= XML Parser and Validator FETCH_CMD= /usr/bin/fetch -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/textproc/xmlroff/Makefile b/textproc/xmlroff/Makefile index 6f97466c43b0..05971ebfcbbb 100644 --- a/textproc/xmlroff/Makefile +++ b/textproc/xmlroff/Makefile @@ -16,7 +16,7 @@ COMMENT= XSL formatter that produces PDF and PostScript LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack gnometarget libgnomeprint libxslt \ libxml2 gtk20 glib20 pango diff --git a/textproc/yamcha/Makefile b/textproc/yamcha/Makefile index 6d7cb5bd218c..93f87eb110ac 100644 --- a/textproc/yamcha/Makefile +++ b/textproc/yamcha/Makefile @@ -15,7 +15,7 @@ COMMENT= Yet Another Multipurpose CHunk Annotator BUILD_DEPENDS= svm_learn:${PORTSDIR}/science/svmlight -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_PERL5_BUILD=yes diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 3a4625fe3415..e1b759ba48c7 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -48,10 +48,10 @@ EXTRA_PATCHES+= ${FILESDIR}/exp-apr-kqueue.patch SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ - LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ + LIBTOOL_M4=${LIBTOOL_M4} \ AUTOHEADER=${AUTOHEADER} USE_ICONV= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_PERL5= yes USE_RC_SUBR= apache2.sh SUB_LIST+= RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX} diff --git a/www/apache20/files/patch-libtool22 b/www/apache20/files/patch-libtool22 new file mode 100644 index 000000000000..b6c6c3265fbf --- /dev/null +++ b/www/apache20/files/patch-libtool22 @@ -0,0 +1,179 @@ +--- configure.in.orig 2009-07-08 14:58:50.000000000 -0500 ++++ configure.in 2009-07-08 15:03:21.000000000 -0500 +@@ -172,7 +172,7 @@ + LIBTOOL="$my_libtool \$(LTFLAGS)" + libtoolversion=`$my_libtool --version` + case $libtoolversion in +- *1.[[45]]*) ++ *1.[[45]]* | *[[2-9]].[[0-9]]*) + SH_LIBTOOL='$(LIBTOOL)' + SHLTCFLAGS="-prefer-pic" + LTCFLAGS="-prefer-non-pic -static" +--- srclib/apr/buildconf.orig 2009-07-08 15:04:26.000000000 -0500 ++++ srclib/apr/buildconf 2009-07-08 15:10:46.000000000 -0500 +@@ -23,7 +23,7 @@ + # + build/buildcheck.sh || exit 1 + +-libtoolize=`build/PrintPath glibtoolize libtoolize` ++libtoolize="${LIBTOOLIZE}" + if [ "x$libtoolize" = "x" ]; then + echo "libtoolize not found in path" + exit 1 +@@ -35,29 +35,47 @@ + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # +-echo "Copying libtool helper files ..." ++echo "buildconf: copying libtool helper files using $libtoolize" + + # Remove any libtool files so one can switch between libtool 1.3 + # and libtool 1.4 by simply rerunning the buildconf script. +-(cd build ; rm -f ltconfig ltmain.sh libtool.m4) ++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) + +-$libtoolize --copy --automake +- +-ltpath=`dirname $libtoolize` +-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} +- +-if [ ! -f $ltfile ]; then ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` ++IFS=.; set $lt_version; IFS=' ' ++if test "$1" = "1"; then ++ $libtoolize --copy --automake ++ if [ -f libtool.m4 ]; then ++ ltfile=`pwd`/libtool.m4 ++ else ++ ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ ++ < $libtoolize`" ++ ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} ++ # Expecting the code above to be very portable, but just in case... ++ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ++ ltpath=`dirname $libtoolize` ++ ltfile=${LIBTOOL_M4} ++ fi ++ fi ++ if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 ++ fi ++ # Do we need this anymore? ++ echo "buildconf: Using libtool.m4 at ${ltfile}." ++ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++fi ++if test "$1" = "2"; then ++ $libtoolize --copy ++ # Wouldn't it just be better to define top_builddir?? ++ mv build/libtool.m4 build/libtool.m4.$$ ++ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++ rm build/libtool.m4.$$ + fi + +-echo "buildconf: Using libtool.m4 at ${ltfile}." +- +-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 +- +-# This is just temporary until people's workspaces are cleared -- remove +-# any old aclocal.m4 left over from prior build so it doesn't cause errors. +-rm -f aclocal.m4 ++# Clean up any leftovers ++rm -f aclocal.m4 libtool.m4 + + # + # Generate the autoconf header and ./configure +--- srclib/apr/configure.in.orig 2009-07-08 15:12:05.000000000 -0500 ++++ srclib/apr/configure.in 2009-07-08 15:13:28.000000000 -0500 +@@ -7,6 +7,7 @@ + AC_INIT(build/apr_common.m4) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) ++AC_CONFIG_MACRO_DIR(build) + + dnl + dnl Include our own M4 macros along with those for libtool +@@ -16,6 +17,11 @@ + sinclude(build/apr_threads.m4) + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) ++sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Save user-defined environment settings for later restoration + dnl +@@ -98,6 +104,8 @@ + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++AC_PROG_SED ++ + dnl Preload + APR_PRELOAD + +@@ -137,6 +145,11 @@ + AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)], + [experimental_libtool=$enableval],[experimental_libtool=no]) + ++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL ++if test "x$Xsed" = "x"; then ++ Xsed="$SED -e 1s/^X//" ++fi ++ + case $host in + *os2*) + # Use a custom-made libtool replacement +--- acinclude.m4.orig 2009-07-10 16:18:04.000000000 -0500 ++++ acinclude.m4 2009-07-10 16:21:02.000000000 -0500 +@@ -169,13 +169,17 @@ + + if test -z "$module_standalone"; then + if test -z "$2"; then +- libname="mod_$1.la" ++ # The filename of a convenience library must have a "lib" prefix: ++ libname="libmod_$1.la" + BUILTIN_LIBS="$BUILTIN_LIBS $modpath_current/$libname" + modpath_static="$modpath_static $libname" + cat >>$modpath_current/modules.mk<<EOF + $libname: $objects + \$(MOD_LINK) $objects $5 + EOF ++ if test ! -z "$5"; then ++ APR_ADDTO(AP_LIBS, [$5]) ++ fi + else + apache_need_shared=yes + libname="mod_$1.la" +--- build/library.mk.orig 2009-07-10 16:22:02.000000000 -0500 ++++ build/library.mk 2009-07-10 16:22:22.000000000 -0500 +@@ -19,4 +19,4 @@ + LTLIBRARY_OBJECTS = $(LTLIBRARY_SOURCES:.c=.lo) $(LTLIBRARY_OBJECTS_X) + + $(LTLIBRARY_NAME): $(LTLIBRARY_OBJECTS) $(LTLIBRARY_DEPENDENCIES) +- $(LINK) $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) ++ $(LINK) -static $(LTLIBRARY_LDFLAGS) $(LTLIBRARY_OBJECTS) $(LTLIBRARY_LIBADD) +--- build/rules.mk.in.orig 2009-07-10 16:23:23.000000000 -0500 ++++ build/rules.mk.in 2009-07-10 16:23:54.000000000 -0500 +@@ -45,7 +45,7 @@ + + LINK = $(LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + SH_LINK = $(SH_LIBTOOL) --mode=link $(COMPILE) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ +-MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -module $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ ++MOD_LINK = $(LIBTOOL) --mode=link $(COMPILE) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ + + # Cross compile commands + +--- build/special.mk.orig 2009-07-10 16:25:08.000000000 -0500 ++++ build/special.mk 2009-07-10 16:26:19.000000000 -0500 +@@ -26,7 +26,7 @@ + install-modules: + @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir); + @builtin='$(BUILTIN_LIBS)'; \ +- has_mod_so=`echo $$builtin|sed 's/^.*mod_so.*$$/has_mod_so/'`; \ ++ has_mod_so=`echo $$builtin|sed 's/^.*libmod_so.*$$/has_mod_so/'`; \ + if [ "x$$has_mod_so" = "xhas_mod_so" ]; then \ + list='$(shared)'; \ + for i in $$list; do \ diff --git a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh b/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh index 0f870848790c..aad61705b316 100644 --- a/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh +++ b/www/apache20/files/patch-srclib:apr-util:xml:expat:buildconf.sh @@ -14,7 +14,7 @@ ltpath=`dirname $libtoolize` -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool${LIBTOOL_VERSION}.m4} ++ltfile=${LIBTOOL_M4} echo "Incorporating $ltfile into aclocal.m4 ..." echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4 echo "dnl edits here will be lost" >> aclocal.m4 diff --git a/www/apache20/files/patch-srclib:apr:buildconf b/www/apache20/files/patch-srclib:apr:buildconf deleted file mode 100644 index 484f86afa37b..000000000000 --- a/www/apache20/files/patch-srclib:apr:buildconf +++ /dev/null @@ -1,28 +0,0 @@ ---- srclib/apr/buildconf Tue Jun 17 20:44:25 2003 -+++ srclib/apr/buildconf Tue Mar 9 07:53:27 2004 -@@ -60,7 +60,7 @@ - # - build/buildcheck.sh || exit 1 - --libtoolize=`build/PrintPath glibtoolize libtoolize` -+libtoolize=${LIBTOOLIZE} - if [ "x$libtoolize" = "x" ]; then - echo "libtoolize not found in path" - exit 1 -@@ -81,14 +81,14 @@ - $libtoolize --copy --automake - - ltpath=`dirname $libtoolize` --ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4} - - if [ ! -f $ltfile ]; then - echo "$ltfile not found" - exit 1 - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -+echo "buildconf: Using ${LIBTOOL_VERSION}.m4 at ${ltfile}." - - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - diff --git a/www/apache22/Makefile b/www/apache22/Makefile index ee10d5fc0246..1f497dbef6ed 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -36,13 +36,13 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* SCRIPTS_ENV+= LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \ LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \ - LIBTOOL_M4=${LOCALBASE}/share/aclocal/libtool${LIBTOOL_VERSION}.m4 \ + LIBTOOL_M4=${LIBTOOL_M4} \ AUTOHEADER=${AUTOHEADER} USE_APACHE= common22 USE_BZIP2= yes USE_ICONV= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 USE_PERL5= yes USE_RC_SUBR= apache22 htcacheclean LIBTOOLFILES= configure diff --git a/www/apache22/files/patch-libtool22 b/www/apache22/files/patch-libtool22 new file mode 100644 index 000000000000..079843239e13 --- /dev/null +++ b/www/apache22/files/patch-libtool22 @@ -0,0 +1,122 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 025_libtool_2.x_fixes.dpatch by <jsw@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update build system to work with libtool 2.x +## DP: +## DP: This corresponds to upstream revisions: +## DP: 733052 +## DP: 742752 +## DP: 748902 +## DP: 757363 +diff --git a/buildconf b/buildconf +index bc0e9fd..11554ed 100755 +--- srclib/apr/buildconf ++++ srclib/apr/buildconf +@@ -35,17 +35,20 @@ fi + # Note: APR supplies its own config.guess and config.sub -- we do not + # rely on libtool's versions + # +-echo "Copying libtool helper files ..." ++echo "buildconf: copying libtool helper files using $libtoolize" + + # Remove any libtool files so one can switch between libtool 1.3 + # and libtool 1.4 by simply rerunning the buildconf script. +-(cd build ; rm -f ltconfig ltmain.sh libtool.m4) +- +-$libtoolize --copy --automake +- +-if [ -f libtool.m4 ]; then +- ltfile=`pwd`/libtool.m4 +-else ++(cd build ; rm -f ltconfig ltmain.sh libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4) ++ ++lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` ++lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` ++IFS=.; set $lt_version; IFS=' ' ++if test "$1" = "1"; then ++ $libtoolize --copy --automake ++ if [ -f libtool.m4 ]; then ++ ltfile=`pwd`/libtool.m4 ++ else + ltfindcmd="`sed -n \"/=[^\\\`]/p;/libtool_m4=/{s/.*=/echo /p;q;}\" \ + < $libtoolize`" + ltfile=${LIBTOOL_M4-`eval "$ltfindcmd"`} +@@ -54,21 +57,21 @@ else + ltpath=`dirname $libtoolize` + ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 + fi +-fi +- +-if [ ! -f $ltfile ]; then ++ fi ++ if [ ! -f $ltfile ]; then + echo "$ltfile not found" + exit 1 ++ fi ++ # Do we need this anymore? ++ echo "buildconf: Using libtool.m4 at ${ltfile}." ++ cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 + fi +- +-echo "buildconf: Using libtool.m4 at ${ltfile}." +- +-cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 +- +-# libtool.m4 from 1.6 requires ltsugar.m4 +-if [ -f ltsugar.m4 ]; then +- rm -f build/ltsugar.m4 +- mv ltsugar.m4 build/ltsugar.m4 ++if test "$1" = "2"; then ++ $libtoolize --copy ++ # Wouldn't it just be better to define top_builddir?? ++ mv build/libtool.m4 build/libtool.m4.$$ ++ cat build/libtool.m4.$$ | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 ++ rm build/libtool.m4.$$ + fi + + # Clean up any leftovers +diff --git a/configure.in b/configure.in +index 46b4b32..2ac1439 100644 +--- srclib/apr/configure.in ++++ srclib/apr/configure.in +@@ -9,6 +9,7 @@ AC_PREREQ(2.50) + AC_INIT(build/apr_common.m4) + AC_CONFIG_HEADER(include/arch/unix/apr_private.h) + AC_CONFIG_AUX_DIR(build) ++AC_CONFIG_MACRO_DIR(build) + + dnl + dnl Include our own M4 macros along with those for libtool +@@ -20,6 +21,10 @@ sinclude(build/apr_win32.m4) + sinclude(build/apr_hints.m4) + sinclude(build/libtool.m4) + sinclude(build/ltsugar.m4) ++sinclude(build/argz.m4) ++sinclude(build/ltoptions.m4) ++sinclude(build/ltversion.m4) ++sinclude(build/lt~obsolete.m4) + + dnl Hard-coded inclusion at the tail end of apr_private.h: + AH_BOTTOM([ +@@ -117,6 +122,8 @@ dnl can only be used once within a configure script, so this prevents a + dnl preload section from invoking the macro to get compiler info. + AC_PROG_CC + ++AC_PROG_SED ++ + dnl Preload + APR_PRELOAD + +@@ -160,6 +167,11 @@ echo "performing libtool configuration..." + AC_ARG_ENABLE(experimental-libtool,[ --enable-experimental-libtool Use experimental custom libtool], + [experimental_libtool=$enableval],[experimental_libtool=no]) + ++dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL ++if test "x$Xsed" = "x"; then ++ Xsed="$SED -e 1s/^X//" ++fi ++ + case $host in + *-os2*) + # Use a custom-made libtool replacement diff --git a/www/apache22/files/patch-srclib-apr-buildconf b/www/apache22/files/patch-srclib-apr-buildconf index 61d311890e74..f8638d7f4634 100644 --- a/www/apache22/files/patch-srclib-apr-buildconf +++ b/www/apache22/files/patch-srclib-apr-buildconf @@ -14,19 +14,10 @@ if [ -z "$ltfile" -o ! -f "$ltfile" ]; then ltpath=`dirname $libtoolize` - ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4 -+ ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/${LIBTOOL_VERSION}.m4} ++ ltfile=${LIBTOOL_M4} fi fi -@@ -61,7 +61,7 @@ - exit 1 - fi - --echo "buildconf: Using libtool.m4 at ${ltfile}." -+echo "buildconf: Using libtool${LIBTOOL_VERSION}.m4 at ${ltfile}." - - cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > build/libtool.m4 - @@ -87,8 +87,11 @@ # Remove autoconf 2.5x's cache directory rm -rf autom4te*.cache diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile index fd9206df2419..4724fdae041a 100644 --- a/www/c-icap/Makefile +++ b/www/c-icap/Makefile @@ -20,7 +20,7 @@ COMMENT= An implementation of an ICAP server GNU_CONFIGURE= yes USE_LDCONFIG= yes USE_RC_SUBR= c_icap -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/c_icap SUB_FILES= pkg-install pkg-deinstall diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist index b4388b20d40a..ac5968016df1 100644 --- a/www/c-icap/pkg-plist +++ b/www/c-icap/pkg-plist @@ -48,7 +48,6 @@ lib/c_icap/srv_url_check.a lib/c_icap/srv_url_check.so lib/c_icap/srv_url_check.la @dirrm lib/c_icap -lib/libicapapi.a lib/libicapapi.la lib/libicapapi.so.0 lib/libicapapi.so diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile index 31b6dee18b26..9cd1d03551fa 100644 --- a/www/cgicc/Makefile +++ b/www/cgicc/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= GNU MAINTAINER= sem@FreeBSD.org COMMENT= A C++ class library for writing CGI applications -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ARGS= NOPORTDOCS=${NOPORTDOCS} diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile index dd121adc9e1d..3cecb64b1d5d 100644 --- a/www/fcgi/Makefile +++ b/www/fcgi/Makefile @@ -14,7 +14,7 @@ PKGNAMESUFFIX= -devkit MAINTAINER= kimelto@gmail.com COMMENT= FastCGI Development Kit -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes diff --git a/www/flickcurl/Makefile b/www/flickcurl/Makefile index 5d2099bf9287..25060746a15c 100644 --- a/www/flickcurl/Makefile +++ b/www/flickcurl/Makefile @@ -16,7 +16,7 @@ COMMENT= C library for the Flickr API LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget ltverhack libxml2 pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc diff --git a/www/flood/Makefile b/www/flood/Makefile index e87858dd7b8a..c205a6ffc6b0 100644 --- a/www/flood/Makefile +++ b/www/flood/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ apr-1:${PORTSDIR}/devel/apr WRKSRC= ${WRKDIR}/httpd-test/flood -USE_AUTOTOOLS= autoconf:262 libtool:15:env +USE_AUTOTOOLS= autoconf:262 libtool:22:env CONFIGURE_ARGS= --disable-shared \ --with-apr=${LOCALBASE}/bin/apr-1-config \ --with-apr-util=${LOCALBASE}/bin/apu-1-config diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile index 3e348e7da6f9..174d89834093 100644 --- a/www/glibwww/Makefile +++ b/www/glibwww/Makefile @@ -16,7 +16,7 @@ COMMENT= A library for people wanting to use libwww with gtk/gnome LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomelibs GNU_CONFIGURE= yes diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile index f28bc4d34356..0df923b5e9d3 100644 --- a/www/gtkhtml/Makefile +++ b/www/gtkhtml/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-gconf=yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 41f06c67ec25..5beddfa0c5e4 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -29,7 +29,7 @@ USE_XORG= xinerama xi xrandr xcursor xcomposite xdamage USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile index 3ef267b6b539..eff5d9cadb39 100644 --- a/www/gtkhtml38/Makefile +++ b/www/gtkhtml38/Makefile @@ -29,7 +29,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui ltverhack \ libgnomeprintui USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/harvest/Makefile b/www/harvest/Makefile index 63f2ea1f9034..71c28ca46377 100644 --- a/www/harvest/Makefile +++ b/www/harvest/Makefile @@ -16,7 +16,7 @@ COMMENT= Collect information from all over the Internet USE_BZIP2= yes USE_PERL5= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure src/gatherer/curl/configure USE_LDCONFIG= yes NO_MTREE= yes diff --git a/www/httrack/Makefile b/www/httrack/Makefile index 63eec65be749..439034c54de5 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GNOME= gnometarget USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes MAN1= htsserver.1 httrack.1 proxytrack.1 webhttrack.1 diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile index 4bff4b5f4d9f..39226a9da290 100644 --- a/www/kdewebdev/Makefile +++ b/www/kdewebdev/Makefile @@ -28,7 +28,7 @@ PREFIX= ${KDE_PREFIX} USE_BZIP2= yes USE_XORG= xpm USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <${.CURDIR}/../../x11/kde3/Makefile.kde> .include <bsd.port.mk> diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile index daecfa813ad6..31ca90b0f6bd 100644 --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -18,7 +18,7 @@ COMMENT= Generic Apache2 Request Library USE_APACHE= 2.0+ USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= autoconf:262 libtool:15 +USE_AUTOTOOLS= autoconf:262 libtool:22 CONFIGURE_ARGS+= --with-apache2-apxs=${APXS} --with-expat=${LOCALBASE} MAKE_ENV+= MAKE=${GMAKE} ## MakeMaker blows it without this diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile index 305655e055e5..fabd867be594 100644 --- a/www/libghttp/Makefile +++ b/www/libghttp/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME http client library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile index c07ce37c06b5..161f8dd59982 100644 --- a/www/libgtkhtml/Makefile +++ b/www/libgtkhtml/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libxslt gnomevfs2 ltverhack USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 34e87f3aaa80..f0e2c50077c8 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= marius@nuenneri.ch COMMENT= The W3C Reference Library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --enable-shared --enable-static --with-zlib --with-ssl=${OPENSSLBASE} diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index dba187732ba2..6a1ee62f3410 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -17,7 +17,7 @@ COMMENT= A secure, fast, compliant, and very flexible Web Server LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre USE_BZIP2= yes -USE_AUTOTOOLS= aclocal:110 autoconf:262 autoheader:262 automake:110 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoconf:262 autoheader:262 automake:110 libtool:22 ACLOCAL_ARGS= --force GNU_CONFIGURE= yes USE_GNOME= lthack pkgconfig diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile index 9002790ab54c..8bc1bb9cd6fa 100644 --- a/www/mnogosearch/Makefile +++ b/www/mnogosearch/Makefile @@ -20,7 +20,7 @@ MAN5= indexer.conf.5 USE_LDCONFIG= yes USE_GNOME= lthack USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--enable-shared \ --sysconfdir=${PREFIX}/etc/mnogosearch \ --localstatedir=/var/mnogosearch \ diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile index ee7002a4903a..fe6df6659b85 100644 --- a/www/mod_clamav/Makefile +++ b/www/mod_clamav/Makefile @@ -16,7 +16,7 @@ COMMENT= Scans content delivered by the Apache20 proxy module for viruses MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_APACHE= 2.2 GNU_CONFIGURE= yes diff --git a/www/mod_cplusplus/Makefile b/www/mod_cplusplus/Makefile index 89b1e052d537..b1e1266aa194 100644 --- a/www/mod_cplusplus/Makefile +++ b/www/mod_cplusplus/Makefile @@ -17,7 +17,7 @@ COMMENT= Apache module for loading C++ objects as handlers MAKE_JOBS_SAFE= yes USE_APACHE= 2.0+ -USE_AUTOTOOLS= autoconf:262 autoheader:262 libtool:15 automake:19 aclocal:19 +USE_AUTOTOOLS= autoconf:262 autoheader:262 libtool:22 automake:19 aclocal:19 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${APXS} diff --git a/www/mod_mono/Makefile b/www/mod_mono/Makefile index 2ef1af9a17aa..767d9f41ffa7 100644 --- a/www/mod_mono/Makefile +++ b/www/mod_mono/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \ USE_APACHE= 2.0+ USE_BZIP2= yes USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --man=${PREFIX}/man MAN8= mod_mono.8 diff --git a/www/mod_transform/Makefile b/www/mod_transform/Makefile index be3ae5871ac2..c4fb55a139d8 100644 --- a/www/mod_transform/Makefile +++ b/www/mod_transform/Makefile @@ -16,7 +16,7 @@ COMMENT= An XSLT and XIncludes Filter module for Apache 2.0 MAKE_JOBS_SAFE= yes USE_APACHE= 2.0 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 HAS_CONFIGURE= yes USE_GNOME= libxslt diff --git a/www/mod_webapp/Makefile b/www/mod_webapp/Makefile index bf66c0647970..08a0ca7bad92 100644 --- a/www/mod_webapp/Makefile +++ b/www/mod_webapp/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/devel/apr:configure USE_APACHE= yes USE_PYTHON_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22:env GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/www/neon26/Makefile b/www/neon26/Makefile index 042da6554659..818d8e913549 100644 --- a/www/neon26/Makefile +++ b/www/neon26/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 CONFLICTS= neon28-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .if defined(WITHOUT_NLS) diff --git a/www/neon28/Makefile b/www/neon28/Makefile index 7504543ff6c8..1cfef3f5e149 100644 --- a/www/neon28/Makefile +++ b/www/neon28/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 CONFLICTS= neon26-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .ifndef WITHOUT_OPENSSL diff --git a/www/neon29/Makefile b/www/neon29/Makefile index 7504543ff6c8..1cfef3f5e149 100644 --- a/www/neon29/Makefile +++ b/www/neon29/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 CONFLICTS= neon26-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .ifndef WITHOUT_OPENSSL diff --git a/www/osb-browser/Makefile b/www/osb-browser/Makefile index f252d9985ce0..b860b7eecc8a 100644 --- a/www/osb-browser/Makefile +++ b/www/osb-browser/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit RUN_DEPENDS= osb-nrcit>=0.5.2:${PORTSDIR}/www/osb-nrcit USE_GNOME= gnomehack gnometarget libglade2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.pre.mk> diff --git a/www/osb-nrcit/Makefile b/www/osb-nrcit/Makefile index a1248f3f775f..3343f021101e 100644 --- a/www/osb-nrcit/Makefile +++ b/www/osb-nrcit/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl RUN_DEPENDS= osb-nrcore>=0.5.2:${PORTSDIR}/www/osb-nrcore USE_GNOME= gnomehack gnometarget gtk20 librsvg2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/www/osb-nrcore/Makefile b/www/osb-nrcore/Makefile index eda66f1da6f4..52969601b681 100644 --- a/www/osb-nrcore/Makefile +++ b/www/osb-nrcore/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= osb-jscore>=0.5.2:${PORTSDIR}/lang/osb-jscore USE_XORG= x11 xt USE_GNOME= gnomehack gnometarget gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" USE_LDCONFIG= yes diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile index 41ef2ac45fbc..a6d5225c0b75 100644 --- a/www/php-dyn/Makefile +++ b/www/php-dyn/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ale@FreeBSD.org COMMENT= A PHP Extension to help debugging a PHP script -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PHP= yes USE_PHPIZE= yes WITH_PHP_MOD= yes diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile index 13c240c1e6f6..4cb30f32cab0 100644 --- a/www/php-screw/Makefile +++ b/www/php-screw/Makefile @@ -20,7 +20,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message CRYPTKEY?= 11152, 368, 192, 1281, 62 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PHP= zlib USE_PHPIZE= yes IGNORE_WITH_PHP=4 diff --git a/www/resin3/Makefile b/www/resin3/Makefile index 67fcea6691ad..f605acd791b1 100644 --- a/www/resin3/Makefile +++ b/www/resin3/Makefile @@ -18,7 +18,7 @@ JAVA_VERSION= 1.2+ HAS_CONFIGURE= yes USE_PYTHON= yes USE_OPENSSL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes # Customizable settings diff --git a/www/suphp/Makefile b/www/suphp/Makefile index 29fa17b7e67b..c4d46e4d1ada 100644 --- a/www/suphp/Makefile +++ b/www/suphp/Makefile @@ -15,7 +15,7 @@ MAINTAINER= yzlin@FreeBSD.org COMMENT= Securely execute PHP scripts under Apache GNU_CONFIGURE= yes -USE_AUTOTOOLS= aclocal:110:env automake:110:env autoconf:262:env libtool:15:env +USE_AUTOTOOLS= aclocal:110:env automake:110:env autoconf:262:env libtool:22:env # Maintainer has not tested suPHP 0.6.x on Apache 1.3. USE_APACHE= 2.0+ diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile index b4b677c41f60..911592443d7e 100644 --- a/www/swfdec-plugin/Makefile +++ b/www/swfdec-plugin/Makefile @@ -17,7 +17,7 @@ COMMENT= Flash rendering plugin LIB_DEPENDS= swfdec-0.8:${PORTSDIR}/graphics/swfdec -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GNOME= gtk20 CONFIGURE_ARGS= --with-plugin-dir="${WEBPLUGINS_DIR}" diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile index 95e6559e772a..f96bb5d1c73f 100644 --- a/www/swish-e/Makefile +++ b/www/swish-e/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://swish-e.org/distribution/ MAINTAINER= chinsan@FreeBSD.org COMMENT= Simple web indexing for humans - enhanced -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= libxml2 USE_GMAKE= yes diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index f44675cbf10c..3b1288dfbfbf 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -30,7 +30,7 @@ USE_GMAKE= yes PLIST_SUB= SHLIB="@comment " NSHLIB="" CONFLICTS= tidy-20000804* tidy-lib-[0-9]* .else -USE_AUTOTOOLS= automake:15 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:15 autoconf:262 libtool:22 AUTOMAKE_ARGS+= -a -c --foreign USE_LDCONFIG= yes PLIST_SUB= SHLIB="" NSHLIB="@comment " diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile index 48a4c9846b9e..3ca4dd05bb4d 100644 --- a/www/webkit-gtk2/Makefile +++ b/www/webkit-gtk2/Makefile @@ -27,7 +27,7 @@ USE_GMAKE= yes USE_GNOME= gtk20 libxslt USE_PERL5= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= autoconf:262 automake:110 libtool:15 +USE_AUTOTOOLS= autoconf:262 automake:110 libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_path_DOLT_BASH="" diff --git a/www/wsdlpull/Makefile b/www/wsdlpull/Makefile index 884defa0c6ad..3679a5c4caf0 100644 --- a/www/wsdlpull/Makefile +++ b/www/wsdlpull/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl MAKE_JOBS_SAFE= yes USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --includedir=${PREFIX}/include/wsdl USE_LDCONFIG= yes diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile index cf590715d003..10e717a9e661 100644 --- a/x11-clocks/bmp-alarm/Makefile +++ b/x11-clocks/bmp-alarm/Makefile @@ -16,7 +16,7 @@ COMMENT= Alarm timer plugin for beep-media-player LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnometarget gtk20 GNU_CONFIGURE= yes diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile index db10fad78723..dd8bfcfbbb13 100644 --- a/x11-clocks/kdetoys3/Makefile +++ b/x11-clocks/kdetoys3/Makefile @@ -21,7 +21,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/x11-drivers/xf86-input-magictouch/Makefile b/x11-drivers/xf86-input-magictouch/Makefile index 82f706a2ef28..46c8ba29d4a7 100644 --- a/x11-drivers/xf86-input-magictouch/Makefile +++ b/x11-drivers/xf86-input-magictouch/Makefile @@ -17,6 +17,6 @@ IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver XORG_CAT= driver MAN4= magictouch.4x -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11-drivers/xf86-video-radeonhd-devel/Makefile b/x11-drivers/xf86-video-radeonhd-devel/Makefile index 983491f1b076..f1a5c7ee4d52 100644 --- a/x11-drivers/xf86-video-radeonhd-devel/Makefile +++ b/x11-drivers/xf86-video-radeonhd-devel/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= pciaccess.0:${PORTSDIR}/devel/libpciaccess XORG_CAT= driver USE_XORG= damageproto glproto videoproto xextproto xf86driproto -USE_AUTOTOOLS= aclocal:19 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:19 autoconf:262 libtool:22 CONFLICTS= xf86-video-radeonhd-[0-9]* xf86-video-ati-[0-9]* diff --git a/x11-fm/dolphin/Makefile b/x11-fm/dolphin/Makefile index 887c9e2954a4..d1cb37701fd3 100644 --- a/x11-fm/dolphin/Makefile +++ b/x11-fm/dolphin/Makefile @@ -15,7 +15,7 @@ MAINTAINER= markus@FreeBSD.org COMMENT= File manager for KDE USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile index c17ff9129cde..7f2d05983393 100644 --- a/x11-fm/gnome-commander2/Makefile +++ b/x11-fm/gnome-commander2/Makefile @@ -27,7 +27,7 @@ USE_BZIP2= yes USE_GNOME= gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 autoconf:262:env aclocal:19:env automake:19:env +USE_AUTOTOOLS= libtool:22 autoconf:262:env aclocal:19:env automake:19:env GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile index 74504ba89d22..b62d54733764 100644 --- a/x11-fm/krusader/Makefile +++ b/x11-fm/krusader/Makefile @@ -15,7 +15,7 @@ MAINTAINER= h.eichmann@gmx.de COMMENT= A two window file-manager for KDE, like midnight or norton commander USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GETTEXT= yes diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index 47c969b6c71d..2888afff4c8e 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ librsvg2 desktopfileutils ltverhack gvfs ltasneededhack GNOME_DESKTOP_VERSION=2 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \ LIBPNG="-L${LOCALBASE}/lib -lpng -lz" diff --git a/x11-fm/pcmanfm/Makefile b/x11-fm/pcmanfm/Makefile index fb161e0c762f..7a9fdebdb922 100644 --- a/x11-fm/pcmanfm/Makefile +++ b/x11-fm/pcmanfm/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= startup-notification-1:${PORTSDIR}/x11/startup-notification USE_BZIP2= yes USE_GNOME= gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_FAM= yes CPPFLAGS+= -I${LOCALBASE}/include diff --git a/x11-fm/velocity/Makefile b/x11-fm/velocity/Makefile index 038b9ba920e8..0a83e7068d52 100644 --- a/x11-fm/velocity/Makefile +++ b/x11-fm/velocity/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ryan.moe@fastfreedom.net COMMENT= GNOME file and desktop manager WRKSRC= ${WRKDIR}/velocity-0.1.0 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= libgnomeui gnomedesktop librsvg2 CONFIGURE_ENV= CPPFLAGS="`pkg-config --cflags libgnomeui-2.0`" \ diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index d1dccc768c72..54b6dcd1313d 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack pkgconfig ltverhack CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \ --with-expat-includes=${LOCALBASE}/include \ diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile index 808d55d4c243..111b41c24c9e 100644 --- a/x11-fonts/gnome-font-sampler/Makefile +++ b/x11-fonts/gnome-font-sampler/Makefile @@ -17,7 +17,7 @@ COMMENT= A program for viewing several fonts at once USE_XORG= x11 USE_GNOME= libgnomeui gnomeprefix -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" post-patch: diff --git a/x11-fonts/libFS/Makefile b/x11-fonts/libFS/Makefile index 5bd36b982de0..265ddc723c25 100644 --- a/x11-fonts/libFS/Makefile +++ b/x11-fonts/libFS/Makefile @@ -14,6 +14,6 @@ COMMENT= The FS library XORG_CAT= lib USE_XORG= fontsproto:both xproto:both xtrans -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile index c91fac6cc8b3..556143a06409 100644 --- a/x11-servers/driglide/Makefile +++ b/x11-servers/driglide/Makefile @@ -18,7 +18,7 @@ COMMENT= Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI USE_XORG= xxf86vm xxf86dga USE_BZIP2= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= automake:14 autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:14 autoconf:262 libtool:22 AUTOMAKE_ARGS= -a USE_GMAKE= yes MAKE_ARGS= PREPROCESSOR=/usr/bin/cpp diff --git a/x11-themes/baghira/Makefile b/x11-themes/baghira/Makefile index 3fea9ed7beb5..e53ab5117c65 100644 --- a/x11-themes/baghira/Makefile +++ b/x11-themes/baghira/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_KDEBASE_VER=3 USE_XORG= xtst USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 # XXX - Workaround for a badly rolled tarball. #pre-configure: diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile index ee10e05c64e2..a65d115da159 100644 --- a/x11-themes/colorstep/Makefile +++ b/x11-themes/colorstep/Makefile @@ -19,7 +19,7 @@ COMMENT= A theme engine based on GtkStep and Step-pastel WRKSRC= ${WRKDIR}/${PORTNAME}-0.6 USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile index a047487e83a3..8b5ffb5ff6a0 100644 --- a/x11-themes/gnome-look/Makefile +++ b/x11-themes/gnome-look/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A GTK theme engine designed to look nice with the GNOME desktop USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/x11-themes/gnome-themes-extras/Makefile b/x11-themes/gnome-themes-extras/Makefile index 9f79733538ab..39c063caf253 100644 --- a/x11-themes/gnome-themes-extras/Makefile +++ b/x11-themes/gnome-themes-extras/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= gtk-engines2>=2.11.0:${PORTSDIR}/x11-themes/gtk-engines2 USE_BZIP2= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack libgnomeui intlhack INSTALLS_ICONS= yes diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile index aaf68a4f776b..99c1a6743ae5 100644 --- a/x11-themes/gnome-themes/Makefile +++ b/x11-themes/gnome-themes/Makefile @@ -24,7 +24,7 @@ CONFLICTS= clearlooks-metacity-0.* USE_BZIP2= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GMAKE= yes USE_GNOME= gnomehack gnomeprefix intlhack metacity libgnomeui diff --git a/x11-themes/gtk-cleanice-engine/Makefile b/x11-themes/gtk-cleanice-engine/Makefile index e6909901f6a4..e55d82eaf084 100644 --- a/x11-themes/gtk-cleanice-engine/Makefile +++ b/x11-themes/gtk-cleanice-engine/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A simplistic GTK+ 2.x theme engine USE_GNOME= gnomehack gnometarget gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 THEME= cleanice-theme-1.2.7 THEMEDIR= ${WRKDIR}/${THEME}/Theme diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile index 94ad354ee60c..a52e3ac6458b 100644 --- a/x11-themes/gtk-engines2/Makefile +++ b/x11-themes/gtk-engines2/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GNOME= gnomehack gtk20 intlhack ltasneededhack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= ANIMATION "Enable experimental animated progressbars" off diff --git a/x11-themes/kde-style-comix/Makefile b/x11-themes/kde-style-comix/Makefile index a11779d0853c..0c88068f7880 100644 --- a/x11-themes/kde-style-comix/Makefile +++ b/x11-themes/kde-style-comix/Makefile @@ -19,7 +19,7 @@ COMMENT= Flat KDE style and window decoration USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile index b2b423ad5ff2..c93dd9c2cb14 100644 --- a/x11-themes/kde-style-lipstik/Makefile +++ b/x11-themes/kde-style-lipstik/Makefile @@ -17,7 +17,7 @@ MAINTAINER= decept0@gmail.com COMMENT= Modified Plastik KDE style USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/x11-themes/kde-style-polyester/Makefile b/x11-themes/kde-style-polyester/Makefile index df6f9f8730ed..11226248de10 100644 --- a/x11-themes/kde-style-polyester/Makefile +++ b/x11-themes/kde-style-polyester/Makefile @@ -20,7 +20,7 @@ COMMENT= KDE style and window decoration USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT} diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile index 2f5c1ec749b2..7ed8aeb96152 100644 --- a/x11-themes/kde-style-tiblit/Makefile +++ b/x11-themes/kde-style-tiblit/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE style focused on customization USE_BZIP2= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= LDFLAGS="${PTHREAD_LIBS}" WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/x11-themes/kde-windeco-activeheart/Makefile b/x11-themes/kde-windeco-activeheart/Makefile index 56f630ce8a87..c393198512b8 100644 --- a/x11-themes/kde-windeco-activeheart/Makefile +++ b/x11-themes/kde-windeco-activeheart/Makefile @@ -19,7 +19,7 @@ COMMENT= Nice KDE window decoration with thin borders USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/kwin-${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-windeco-crystal/Makefile b/x11-themes/kde-windeco-crystal/Makefile index db6e9855c130..9c296c9d013f 100644 --- a/x11-themes/kde-windeco-crystal/Makefile +++ b/x11-themes/kde-windeco-crystal/Makefile @@ -18,7 +18,7 @@ COMMENT= Transparent KDE window decoration USE_BZIP2= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} NO_LATEST_LINK= yes diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile index c09260fa0e04..9e6776783d2f 100644 --- a/x11-themes/kde-windeco-knifty/Makefile +++ b/x11-themes/kde-windeco-knifty/Makefile @@ -19,7 +19,7 @@ COMMENT= Lightweight KDE window decoration USE_BZIP2= yes USE_KDEBASE_VER=3 CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-windeco-neos/Makefile b/x11-themes/kde-windeco-neos/Makefile index 210a31cf4453..a438abf8ac4b 100644 --- a/x11-themes/kde-windeco-neos/Makefile +++ b/x11-themes/kde-windeco-neos/Makefile @@ -18,7 +18,7 @@ COMMENT= KDE window decoration USE_BZIP2= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/kwin-${PORTNAME}-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kde-windeco-smoothblend/Makefile b/x11-themes/kde-windeco-smoothblend/Makefile index 7778ddb604f1..834340420e2e 100644 --- a/x11-themes/kde-windeco-smoothblend/Makefile +++ b/x11-themes/kde-windeco-smoothblend/Makefile @@ -21,7 +21,7 @@ CONFLICTS= kdeartwork-3.5.[0-9]* USE_BZIP2= yes USE_GMAKE= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/smooth-blend-${PORTVERSION} .include <bsd.port.mk> diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile index e23964d60e93..fd61195f90a8 100644 --- a/x11-themes/kdeartwork3/Makefile +++ b/x11-themes/kdeartwork3/Makefile @@ -26,7 +26,7 @@ USE_GL= yes USE_BZIP2= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile index 6fe65694d7c5..8b1a8672e2ca 100644 --- a/x11-themes/kdmtheme/Makefile +++ b/x11-themes/kdmtheme/Makefile @@ -18,7 +18,7 @@ COMMENT= KDM Theme Manager USE_KDEBASE_VER=3 USE_BZIP2= yes USE_PERL5_BUILD=yes -USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262:env libtool:22 USE_GMAKE= yes pre-configure: diff --git a/x11-themes/moodin/Makefile b/x11-themes/moodin/Makefile index 2550836e6986..631f20576739 100644 --- a/x11-themes/moodin/Makefile +++ b/x11-themes/moodin/Makefile @@ -16,7 +16,7 @@ COMMENT= Splash screen engine for KDE USE_KDEBASE_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile index d7c709707e1c..17bf65d25450 100644 --- a/x11-themes/notif2/Makefile +++ b/x11-themes/notif2/Makefile @@ -19,7 +19,7 @@ COMMENT= The Notif2 GTK theme engine following the new Motif look and feel WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GTKVERSION= 1.2 diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile index 81705ee86c4c..cee144499211 100644 --- a/x11-themes/phase/Makefile +++ b/x11-themes/phase/Makefile @@ -18,7 +18,7 @@ CONFLICTS= kdeartwork-3.4.* USE_KDEBASE_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile index 7c1dc768aeb8..9532b6b35f02 100644 --- a/x11-themes/qinx/Makefile +++ b/x11-themes/qinx/Makefile @@ -16,7 +16,7 @@ COMMENT= A QNX Photon like window decoration and widget style for KDE USE_KDEBASE_VER=3 USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib/kde3 diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile index 8edc24af569f..afdaaf15484e 100644 --- a/x11-themes/qnxstyle/Makefile +++ b/x11-themes/qnxstyle/Makefile @@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_KDELIBS_VER=3 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes PLIST_FILES= lib/kde3/plugins/styles/qnx.a \ diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile index 44f5c8bbcf47..b855730861d3 100644 --- a/x11-themes/thinice/Makefile +++ b/x11-themes/thinice/Makefile @@ -19,6 +19,6 @@ COMMENT= A clean-looking GTK Theme Engine WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION} USE_GNOME= gtk12 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile index 27a386da904b..f8e577558104 100644 --- a/x11-toolkits/bakery/Makefile +++ b/x11-toolkits/bakery/Makefile @@ -24,7 +24,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack ltverhack USE_BZIP2= yes USE_GMAKE= yes USE_GETTEXT= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile index fc858dd09505..1907c950fcae 100644 --- a/x11-toolkits/blt/Makefile +++ b/x11-toolkits/blt/Makefile @@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Tk extension (with shared libs) USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/blt2.4z GNU_CONFIGURE= yes diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile index 3804961296f5..e8b0894515d0 100644 --- a/x11-toolkits/eel/Makefile +++ b/x11-toolkits/eel/Makefile @@ -22,7 +22,7 @@ USE_GMAKE= yes USE_XORG= xrender GNOME_DESKTOP_VERSION=2 USE_GNOME= gnomeprefix gnomehack gnomedesktop ltverhack intlhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-shared --enable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile index 79305b38738e..fa7e6750aa15 100644 --- a/x11-toolkits/fox12/Makefile +++ b/x11-toolkits/fox12/Makefile @@ -29,7 +29,7 @@ MAJORVER= 1.2 SHVER= 18 PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= lthack USE_GL= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 950a708bacc0..b5be5b8a8d00 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -29,7 +29,7 @@ MAJORVER= 1.4 SHVER= 35 PLIST_SUB+= MAJORVER=${MAJORVER} SHVER=${SHVER} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile index 499516b30aa9..ad3f2f8c2d44 100644 --- a/x11-toolkits/fxscintilla/Makefile +++ b/x11-toolkits/fxscintilla/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= araujo@FreeBSD.org COMMENT= A Fox toolkit reimplementation of Scintilla editing widget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --enable-shared --disable-static USE_LDCONFIG= yes diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 2a71243d818e..390c9e19d63b 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -26,7 +26,7 @@ USE_ICONV= yes USE_GETTEXT= yes GNOME_HTML_DIR= ${PREFIX}/share/doc/gal USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index a8507ee5df04..263bde92f4b0 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -29,7 +29,7 @@ USE_GNOME= gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \ USE_GETTEXT= yes USE_XORG= x11 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --enable-static --with-libiconv CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile index f384f9197f84..1cb3a076903d 100644 --- a/x11-toolkits/gtk-sharp10/Makefile +++ b/x11-toolkits/gtk-sharp10/Makefile @@ -26,7 +26,7 @@ USE_PERL5_RUN= yes USE_GNOME= gnomehack gtkhtml3 vte librsvg2 libgnomecanvas \ libgnomeprintui libglade2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${FIND} ${WRKSRC} -name '*.pl' | ${XARGS} ${REINPLACE_CMD} -e \ diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile index 267fa076f6a1..d36f1165d3da 100644 --- a/x11-toolkits/gtk12/Makefile +++ b/x11-toolkits/gtk12/Makefile @@ -20,7 +20,7 @@ USE_PERL5= yes USE_XORG= x11 ice xext sm inputproto xi USE_GNOME= glib12 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --includedir=${PREFIX}/include/gtk12 --with-native-locale \ --with-xinput=xfree CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 5517b22d9a88..5d8c1314ea90 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -39,7 +39,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_GMAKE= yes USE_PERL5= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 5517b22d9a88..5d8c1314ea90 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -39,7 +39,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ USE_GMAKE= yes USE_PERL5= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack atk pango ltverhack USE_GETTEXT= yes USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile index 5b9029115d40..d25c717cba25 100644 --- a/x11-toolkits/gtkdatabox/Makefile +++ b/x11-toolkits/gtkdatabox/Makefile @@ -18,7 +18,7 @@ COMMENT= A GTK+2 widget to display large amounts of numerical data USE_LDCONFIG= yes USE_GNOME= gnomehack gtk20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --includedir="${PREFIX}/include/${PORTNAME}" \ --with-html-dir="${PREFIX}/share/doc" diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile index 20815284b2f0..d84343a26c9b 100644 --- a/x11-toolkits/gtkextra/Makefile +++ b/x11-toolkits/gtkextra/Makefile @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A useful widget set complementary to GTK+ -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GNOME= gtk12 USE_GMAKE= yes diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile index 5ae3deb451de..9191ac9d34bc 100644 --- a/x11-toolkits/gtkextra2/Makefile +++ b/x11-toolkits/gtkextra2/Makefile @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A useful widget set complementary to GTK+ 2.0 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 gnomehack USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile index 7f1f80c8cd0a..344220a5f65c 100644 --- a/x11-toolkits/gtkglarea--/Makefile +++ b/x11-toolkits/gtkglarea--/Makefile @@ -21,7 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \ gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= yes USE_GNOME= gtk12 GNU_CONFIGURE= yes diff --git a/x11-toolkits/gtkglarea/Makefile b/x11-toolkits/gtkglarea/Makefile index 320846e03d6b..f99b250561a0 100644 --- a/x11-toolkits/gtkglarea/Makefile +++ b/x11-toolkits/gtkglarea/Makefile @@ -17,7 +17,7 @@ COMMENT= An OpenGL widget for the GTK+ GUI toolkit WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GL= yes USE_GNOME= gnometarget gtk12 lthack GNU_CONFIGURE= yes diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile index 2f4ada59553c..69de06608224 100644 --- a/x11-toolkits/gtkglarea2/Makefile +++ b/x11-toolkits/gtkglarea2/Makefile @@ -19,7 +19,7 @@ LATEST_LINK= gtkglarea2 USE_GNOME= gnomehack gtk20 USE_BZIP2= yes USE_GL= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-lib-GL diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile index a83d4a96484f..20b574815d4a 100644 --- a/x11-toolkits/gtkglext/Makefile +++ b/x11-toolkits/gtkglext/Makefile @@ -21,7 +21,7 @@ USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 USE_GL= yes USE_XORG= xt USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/x11-toolkits/gtkglextmm/Makefile b/x11-toolkits/gtkglextmm/Makefile index 89482f7f8297..c276ce7c010e 100644 --- a/x11-toolkits/gtkglextmm/Makefile +++ b/x11-toolkits/gtkglextmm/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext \ USE_BZIP2= yes USE_GNOME= gnomehack gnomeprefix gnometarget gtk20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.mk> diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile index 55d1baec146a..5d3b450c4426 100644 --- a/x11-toolkits/gtkmathview/Makefile +++ b/x11-toolkits/gtkmathview/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ USE_GNOME= gnomehack gtk20 libxml2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" USE_LDCONFIG= yes diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile index d9fbaad32ff7..96dd41232481 100644 --- a/x11-toolkits/gtkmm12/Makefile +++ b/x11-toolkits/gtkmm12/Makefile @@ -18,7 +18,7 @@ COMMENT= C++ wrapper for gtk, a x11 graphics library LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gtk12 diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index 7a885ef26d12..00403e7d3e13 100644 --- a/x11-toolkits/gtkmm20/Makefile +++ b/x11-toolkits/gtkmm20/Makefile @@ -26,7 +26,7 @@ LATEST_LINK= gtkmm2 LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 7a885ef26d12..00403e7d3e13 100644 --- a/x11-toolkits/gtkmm30/Makefile +++ b/x11-toolkits/gtkmm30/Makefile @@ -26,7 +26,7 @@ LATEST_LINK= gtkmm2 LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/gtksourceview-sharp/Makefile b/x11-toolkits/gtksourceview-sharp/Makefile index c89f373e79f1..c71be5409a8d 100644 --- a/x11-toolkits/gtksourceview-sharp/Makefile +++ b/x11-toolkits/gtksourceview-sharp/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= mono:${PORTSDIR}/lang/mono \ USE_BZIP2= yes USE_GNOME= gtksourceview gnomehack gtksharp20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes post-patch: diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile index 37d1414c11e5..6f8d9aa5825d 100644 --- a/x11-toolkits/gtksourceview/Makefile +++ b/x11-toolkits/gtksourceview/Makefile @@ -22,7 +22,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack libgnome libgnomeprintui intlhack \ ltverhack referencehack diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile index 1d99052e9523..3b2aca00591b 100644 --- a/x11-toolkits/gtksourceview2/Makefile +++ b/x11-toolkits/gtksourceview2/Makefile @@ -24,7 +24,7 @@ USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_GNOME= gnomeprefix gnomehack gtk20 libxml2 intlhack \ ltverhack referencehack diff --git a/x11-toolkits/gtkunique/Makefile b/x11-toolkits/gtkunique/Makefile index cd4230e0b91f..7e5f8e94b9c7 100644 --- a/x11-toolkits/gtkunique/Makefile +++ b/x11-toolkits/gtkunique/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= pav@FreeBSD.org COMMENT= Single instance application library -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_GNOME= gtk20 ltverhack USE_LDCONFIG= yes diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile index d987cf536400..e9ef2caf83bb 100644 --- a/x11-toolkits/guile-gtk/Makefile +++ b/x11-toolkits/guile-gtk/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= guile.20:${PORTSDIR}/lang/guile USE_GMAKE= yes USE_GNOME= gnometarget ltverhack gdkpixbuf libglade -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --with-gtkgl=no CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile index 5f48018411d2..a14fe3616d42 100644 --- a/x11-toolkits/lesstif/Makefile +++ b/x11-toolkits/lesstif/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ CONFLICTS?= open-motif-* USE_BZIP2= yes -USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:15 +USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:22 USE_XORG= sm ice xt xp xext x11 xextproto xrender xft USE_LDCONFIG= yes LIBTOOLFILES= aclocal.m4 test/aclocal.m4 diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile index f6d3aa6cd042..a1fc35c2c05a 100644 --- a/x11-toolkits/libbonobouimm/Makefile +++ b/x11-toolkits/libbonobouimm/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomeprefix libbonoboui -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile index b34fce692e9f..f5e2eedd828f 100644 --- a/x11-toolkits/libgdiplus/Makefile +++ b/x11-toolkits/libgdiplus/Makefile @@ -24,7 +24,7 @@ USE_GMAKE= yes USE_XLIB= yes USE_LDCONFIG= yes LIBTOOLFILES= configure cairo/configure -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" # Included cairo does not work for us. Enable below when Mono catches diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile index b015cd61d144..429072de5863 100644 --- a/x11-toolkits/libgnomeprintui/Makefile +++ b/x11-toolkits/libgnomeprintui/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gnomeprefix gnomehack libgnomeprint libgnomecanvas \ intlhack ltverhack USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile index aba12e3ad769..40a044ff3a8e 100644 --- a/x11-toolkits/libgnomeprintuimm/Makefile +++ b/x11-toolkits/libgnomeprintuimm/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ gnomeprintmm-2.5.2:${PORTSDIR}/print/libgnomeprintmm BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack libgnomeprintui diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile index 4709fcec0529..93d963058964 100644 --- a/x11-toolkits/libgnomeui/Makefile +++ b/x11-toolkits/libgnomeui/Makefile @@ -30,7 +30,7 @@ USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack gnomehier libbonoboui ltverhack \ referencehack gvfs USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BISON= build CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile index 4effbd47ad8b..fd939f0846b2 100644 --- a/x11-toolkits/libgnomeuimm/Makefile +++ b/x11-toolkits/libgnomeuimm/Makefile @@ -23,7 +23,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_GMAKE= yes USE_GNOME= gnomehack libgnomeui -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile index afc410c46227..ddd7b6714003 100644 --- a/x11-toolkits/libgnomeuimm26/Makefile +++ b/x11-toolkits/libgnomeuimm26/Makefile @@ -25,7 +25,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 LATEST_LINK= libgnomeuimm26 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_XORG= x11 USE_GMAKE= yes diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile index c514bb3bb601..d1d1d2c23217 100644 --- a/x11-toolkits/libgtkeditor/Makefile +++ b/x11-toolkits/libgtkeditor/Makefile @@ -18,7 +18,7 @@ COMMENT= A source code editor widget for GTK+ LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode -USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:15 +USE_AUTOTOOLS= automake:15:env autoconf:262:env libtool:22 USE_GNOME= gtk12 USE_GMAKE= yes USE_PERL5_BUILD=yes diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile index 1d4c7709d0e7..49832934d565 100644 --- a/x11-toolkits/libpanelappletmm/Makefile +++ b/x11-toolkits/libpanelappletmm/Makefile @@ -22,7 +22,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack lthack gnomepanel -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-static diff --git a/x11-toolkits/libsexy/Makefile b/x11-toolkits/libsexy/Makefile index fc4ca0d23d2c..949f9560fc6f 100644 --- a/x11-toolkits/libsexy/Makefile +++ b/x11-toolkits/libsexy/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso- LIB_DEPENDS= enchant:${PORTSDIR}/textproc/enchant RUN_DEPENDS:= ${BUILD_DEPENDS} -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack lthack gtk20 libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/libsexymm/Makefile b/x11-toolkits/libsexymm/Makefile index a6c35f255cb9..5ce9bebcedcb 100644 --- a/x11-toolkits/libsexymm/Makefile +++ b/x11-toolkits/libsexymm/Makefile @@ -17,7 +17,7 @@ COMMENT= C++ bindings for libsexy LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ sexy:${PORTSDIR}/x11-toolkits/libsexy -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile index 316dc20a9850..0886675c91d7 100644 --- a/x11-toolkits/libwnck/Makefile +++ b/x11-toolkits/libwnck/Makefile @@ -28,7 +28,7 @@ USE_GMAKE= yes USE_GNOME= gnomehack gtk20 ltverhack referencehack intlhack USE_BISON= build USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile index 9d514f01a516..a9cabe98ec3a 100644 --- a/x11-toolkits/libxfce4gui/Makefile +++ b/x11-toolkits/libxfce4gui/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= XFce 4 widget library required by xfce4 and xfwm4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile index 581e892382ba..ef520b49841b 100644 --- a/x11-toolkits/libzvt/Makefile +++ b/x11-toolkits/libzvt/Makefile @@ -20,7 +20,7 @@ USE_XORG= x11 USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix gnomehack gtk20 libartlgpl2 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile index cd871f6d3949..60f8f02029d2 100644 --- a/x11-toolkits/movingmotif/Makefile +++ b/x11-toolkits/movingmotif/Makefile @@ -15,7 +15,7 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= Display scientific data as dynamic plot USE_MOTIF= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile index 44b5ee1b3416..162572f6cb5f 100644 --- a/x11-toolkits/mowitz/Makefile +++ b/x11-toolkits/mowitz/Makefile @@ -15,7 +15,7 @@ COMMENT= This is the Mowitz ("More widgets") library LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_XORG= ice sm x11 xaw xext xmu xpm xt USE_LDCONFIG= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile index b07743f08705..c88ea7932511 100644 --- a/x11-toolkits/neXtaw/Makefile +++ b/x11-toolkits/neXtaw/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://siag.nu/pub/neXtaw/ MAINTAINER= ports@FreeBSD.org COMMENT= Athena Widgets with N*XTSTEP appearance -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_XORG= xmu x11 xext GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile index 51d61ebb9e3f..a4c2f7dc2081 100644 --- a/x11-toolkits/open-motif/Makefile +++ b/x11-toolkits/open-motif/Makefile @@ -20,7 +20,7 @@ COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295)) MAKE_JOBS_UNSAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFLICTS= lesstif-* USE_GMAKE= yes USE_XORG= xaw xbitmaps diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index 094bd7c4151e..5d745929bb7f 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -30,7 +30,7 @@ USE_GETTEXT= yes USE_GMAKE= yes MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 ltverhack referencehack CONFIGURE_ARGS= --with-qt=no \ --with-html-dir=${PREFIX}/share/doc \ diff --git a/x11-toolkits/pangoxsl/Makefile b/x11-toolkits/pangoxsl/Makefile index a475ba98a001..34cb4f3c870b 100644 --- a/x11-toolkits/pangoxsl/Makefile +++ b/x11-toolkits/pangoxsl/Makefile @@ -18,7 +18,7 @@ COMMENT= Implements Pango library with a PDF backend for PDF output USE_GMAKE= yes USE_GNOME= gnomehack pango USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --disable-gtk-doc \ --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile index e6e12fc2508e..c149a6445104 100644 --- a/x11-toolkits/paragui-devel/Makefile +++ b/x11-toolkits/paragui-devel/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \ CONFLICTS= paragui-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl image ttf LIBTOOLFLAGS= --disable-ltlibs --release-ignore CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile index 89fadeaa8691..89c6407bd23f 100644 --- a/x11-toolkits/paragui/Makefile +++ b/x11-toolkits/paragui/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= physfs.1:${PORTSDIR}/devel/physfs \ CONFLICTS= paragui-devel-[0-9]* -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl image ttf CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}" diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile index a821417c62d4..7a95f3ce0294 100644 --- a/x11-toolkits/php-gtk/Makefile +++ b/x11-toolkits/php-gtk/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://gtk.php.net/distributions/ \ MAINTAINER= zaa@zaa.pp.ru COMMENT= An extension to use gtk in PHP-applications -USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:22:env GNU_CONFIGURE= yes USE_PHP= pcre USE_PHP_BUILD= yes diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile index a821417c62d4..7a95f3ce0294 100644 --- a/x11-toolkits/php-gtk2/Makefile +++ b/x11-toolkits/php-gtk2/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://gtk.php.net/distributions/ \ MAINTAINER= zaa@zaa.pp.ru COMMENT= An extension to use gtk in PHP-applications -USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:15:env +USE_AUTOTOOLS= automake:19:env autoconf:262 libtool:22:env GNU_CONFIGURE= yes USE_PHP= pcre USE_PHP_BUILD= yes diff --git a/x11-toolkits/py-sexy/Makefile b/x11-toolkits/py-sexy/Makefile index e8e3754f189b..0262e52d4013 100644 --- a/x11-toolkits/py-sexy/Makefile +++ b/x11-toolkits/py-sexy/Makefile @@ -18,7 +18,7 @@ COMMENT= Libsexy bindings for Python LIB_DEPENDS= sexy.2:${PORTSDIR}/x11-toolkits/libsexy -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pygtk2 pkgconfig USE_PYTHON= yes GNU_CONFIGURE= yes diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index 91727071a8ce..87847188dc92 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_BZIP2= yes USE_GNOME= gtk20 GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf:262:env automake:110:env libtool:15:env +USE_AUTOTOOLS= autoconf:262:env automake:110:env libtool:22:env CONFIGURE_SCRIPT= autogen.sh CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile index 4e7dda3c5d55..7e029f921aeb 100644 --- a/x11-toolkits/sdl_gui/Makefile +++ b/x11-toolkits/sdl_gui/Makefile @@ -16,7 +16,7 @@ DISTNAME= SDL_gui-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A Graphical User Interface library for SDL -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl image ttf GNU_CONFIGURE= yes USE_LDCONFIG= yes diff --git a/x11-toolkits/sdl_pango/Makefile b/x11-toolkits/sdl_pango/Makefile index 5cad452f435b..540e34cdde79 100644 --- a/x11-toolkits/sdl_pango/Makefile +++ b/x11-toolkits/sdl_pango/Makefile @@ -19,7 +19,7 @@ PATCHFILES= SDL_Pango-0.1.2-API-adds.patch MAINTAINER= edwin@mavetju.org COMMENT= SDL_Pango is the SDL API to the Pango text rendering engine of GNOME 2.x -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_SDL= sdl USE_GNOME= pango GNU_CONFIGURE= yes diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile index ef943359d901..5fbe6e8326c6 100644 --- a/x11-toolkits/soqt/Makefile +++ b/x11-toolkits/soqt/Makefile @@ -18,7 +18,7 @@ COMMENT= Qt4 toolkit library for Coin LIB_DEPENDS= Coin.60:${PORTSDIR}/graphics/Coin -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_QT_VER= 4 QT_COMPONENTS= corelib qt3support opengl moc_build USE_GMAKE= yes diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile index 1d789ca2cb5b..77650d91822c 100644 --- a/x11-toolkits/unique/Makefile +++ b/x11-toolkits/unique/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus USE_XORG= ice USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk20 gnomeprefix GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile index 0405a928415e..17f632038b3e 100644 --- a/x11-toolkits/vdk/Makefile +++ b/x11-toolkits/vdk/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= vdklib MAINTAINER= ports@FreeBSD.org COMMENT= C++ wrapper for GTK+ toolkit -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack gnometarget gtk20 GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile index 01fec283855c..37ee8979742e 100644 --- a/x11-toolkits/vdkbuilder/Makefile +++ b/x11-toolkits/vdkbuilder/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= vdk.6:${PORTSDIR}/x11-toolkits/vdk USE_GNOME= gnometarget gtk20 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --enable-opt=no diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile index 4fb1cc4b4990..1b753eb65d3f 100644 --- a/x11-toolkits/vte/Makefile +++ b/x11-toolkits/vte/Makefile @@ -23,7 +23,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_BISON= build USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes USE_GNOME?= gnomeprefix gnomehack gtk20 ltverhack referencehack CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile index 05e5a75b5fde..d7e3b20e7fdb 100644 --- a/x11-toolkits/xbae/Makefile +++ b/x11-toolkits/xbae/Makefile @@ -17,7 +17,7 @@ DISTNAME= xbae-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A Motif-based widget which displays a grid of cells as a spreadsheet -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes USE_MOTIF= yes CONFIGURE_ARGS=--enable-production --enable-static diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile index 0e7b4318ddc7..92a69e0eebfd 100644 --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -17,7 +17,7 @@ COMMENT= A Motif widget set for displaying HTML 3.2 documents LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ jpeg.10:${PORTSDIR}/graphics/jpeg -USE_AUTOTOOLS= libtool:15:env +USE_AUTOTOOLS= libtool:22:env USE_MOTIF= yes USE_GMAKE= yes USE_LDCONFIG= yes diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile index 7292d3c58b78..57aa739cdf0f 100644 --- a/x11-wm/compiz-plugins-extra/Makefile +++ b/x11-wm/compiz-plugins-extra/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomehack intltool USE_XORG= glproto USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= compiz-3d.schemas \ compiz-addhelper.schemas \ diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile index 9f685f00f505..0ff6c1f8929b 100644 --- a/x11-wm/compiz-plugins-main/Makefile +++ b/x11-wm/compiz-plugins-main/Makefile @@ -28,7 +28,7 @@ USE_GNOME= gnomehack intltool USE_XORG= glproto USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= compiz-animation.schemas \ compiz-colorfilter.schemas \ diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile index df96b393a4d7..471197736be3 100644 --- a/x11-wm/compiz-plugins-unsupported/Makefile +++ b/x11-wm/compiz-plugins-unsupported/Makefile @@ -29,7 +29,7 @@ USE_GNOME= gnomehack intltool USE_XORG= glproto USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= compiz-atlantis.schemas \ compiz-cubemodel.schemas \ diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index eb39274da38f..61df6dcf9b67 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -27,7 +27,7 @@ USE_GL= glu USE_GNOME= gnomehack gconf2 libxslt USE_XORG= xcomposite xfixes xdamage xrandr xrender ice sm xinerama glproto USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GCONF_SCHEMAS= gwd.schemas \ compiz-annotate.schemas \ diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile index e4b417071121..69134ef381b7 100644 --- a/x11-wm/compizconfig-backend-gconf/Makefile +++ b/x11-wm/compizconfig-backend-gconf/Makefile @@ -21,7 +21,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack glib20 gconf2 diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile index 51065f4061ba..bb527377b1a2 100644 --- a/x11-wm/compizconfig-python/Makefile +++ b/x11-wm/compizconfig-python/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes USE_PYTHON= yes USE_GNOME= gnomehack glib20 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 post-patch: @${REINPLACE_CMD} -e \ diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile index 7bd51afb3820..8f27d0fb9125 100644 --- a/x11-wm/emerald/Makefile +++ b/x11-wm/emerald/Makefile @@ -26,7 +26,7 @@ USE_GNOME= gnomehack gtk20 libwnck pango USE_XORG= xrender USE_GETTEXT= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= emerald.1 \ emerald-theme-manager.1 diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile index c97fbc7fd4ba..5d674c60b316 100644 --- a/x11-wm/epplets/Makefile +++ b/x11-wm/epplets/Makefile @@ -24,7 +24,7 @@ USE_XORG= xext USE_GNOME= esound gnometarget USE_GL= glut USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 autoconf:262 +USE_AUTOTOOLS= libtool:22 autoconf:262 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile index a2111740f4b5..eb2c4237f25e 100644 --- a/x11-wm/ion-2/Makefile +++ b/x11-wm/ion-2/Makefile @@ -8,17 +8,19 @@ PORTNAME= ion-2 PORTVERSION= 20040729 -PORTREVISION= 3 +PORTREVISION= 5 CATEGORIES= x11-wm MASTER_SITES= http://modeemi.fi/~tuomov/dl/archives/ MAINTAINER= ports@FreeBSD.org COMMENT= A tiling tabbed window manager +BROKEN= Does not build with new libltdl 2.2 + CONFLICTS= ion-2002* ion-devel-* pwm-* USE_XORG= x11 xext xinerama -USE_AUTOTOOLS= libtool:15 libltdl:15 +USE_AUTOTOOLS= libtool:22 libltdl:22 USE_LUA= 5.0 USE_GMAKE= yes MAKE_ENV= DEFINES="${IONDEFINES}" diff --git a/x11-wm/kappdock/Makefile b/x11-wm/kappdock/Makefile index 4547d6211edc..24215707c887 100644 --- a/x11-wm/kappdock/Makefile +++ b/x11-wm/kappdock/Makefile @@ -18,7 +18,7 @@ COMMENT= A dock-like applet for KDE3 USE_GETTEXT= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include \ --enable-threads \ --disable-closure diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile index 15bfa409ef0c..526a3b66373b 100644 --- a/x11-wm/libcompizconfig/Makefile +++ b/x11-wm/libcompizconfig/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomehack intltool libxml2 diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile index a34d996e7564..5057f32d8ae9 100644 --- a/x11-wm/libdockapp/Makefile +++ b/x11-wm/libdockapp/Makefile @@ -16,7 +16,7 @@ COMMENT= Standard library for Window Maker dock apps USE_BZIP2= yes USE_XORG= xext xpm USE_GNOME= gnometarget -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --without-font --without-examples USE_LDCONFIG= yes diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile index 3c77e9e60711..41c6cbaba1bb 100644 --- a/x11-wm/metacity/Makefile +++ b/x11-wm/metacity/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_XORG= x11 xcomposite xdamage USE_GETTEXT= yes USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20 USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile index e04a2fd97630..bbf613f08692 100644 --- a/x11-wm/openbox/Makefile +++ b/x11-wm/openbox/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft GNU_CONFIGURE= yes USE_GMAKE= yes USE_GNOME= glib20 libxml2 ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index fac395fd97ee..ccc4924f4156 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDI MAKE_JOBS_SAFE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_GNOME= gnomehack gnometarget pkgconfig USE_XORG= xpm diff --git a/x11/babl/Makefile b/x11/babl/Makefile index 14e496691f5e..e731eff6185a 100644 --- a/x11/babl/Makefile +++ b/x11/babl/Makefile @@ -23,7 +23,7 @@ COMMENT= Dynamic pixel format conversion library USE_LDCONFIG= yes USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= pkgconfig gnomehack ltverhack USE_GMAKE= yes diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index 56d553c24748..8d5377431996 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -25,7 +25,7 @@ USE_GMAKE= yes USE_GNOME= glib12 USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 WRKSRC= ${WRKDIR}/${PORTNAME}-0.5.9 MAN1= dgs.1 dpsnx.agent.1 diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index b3435524aae6..fae71f217b95 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -18,7 +18,7 @@ COMMENT?= X11 terminal emulator based on rxvt/xterm BUILD_DEPENDS= man2html:${PORTSDIR}/textproc/man2html LIB_DEPENDS= ast.2:${PORTSDIR}/devel/libast -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes CONFIGURE_ARGS?=--enable-trans --enable-utmp \ --enable-xim --with-theme-update \ diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index 0d5461fb77df..35cdcfb0ece9 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -17,7 +17,7 @@ COMMENT= An anti-aliased font support for gtk+ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GNOME= gtk12 WANT_GNOME= yes USE_ICONV= yes diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index a686bedfd933..32bd5a0144c2 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -32,7 +32,7 @@ USE_BISON= build USE_PYTHON= yes INSTALLS_OMF= yes USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile index 82dcbdaf5a35..3680311ec2f1 100644 --- a/x11/gnome-launch-box/Makefile +++ b/x11/gnome-launch-box/Makefile @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= libgnomeui evolutiondataserver gnomemenus gnomedesktop -USE_AUTOTOOLS= autoconf:262 autoheader:262 automake:19 aclocal:19 libtool:15 +USE_AUTOTOOLS= autoconf:262 autoheader:262 automake:19 aclocal:19 libtool:22 ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= -a LIBTOOLFILES= diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index d3ac034c9ea7..151f63199686 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -19,7 +19,7 @@ USE_GETTEXT= yes USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack glib20 ltverhack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PYTHON= yes USE_LDCONFIG= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 71a8156c06ae..cf428bd304e2 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -32,7 +32,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \ WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc \ --disable-network-manager \ diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile index c3c82626f2e9..0854647ff7b8 100644 --- a/x11/gtkterm2/Makefile +++ b/x11/gtkterm2/Makefile @@ -17,7 +17,7 @@ COMMENT= A simple GTK-2 terminal with tabs USE_GNOME= gnometarget vte USE_GMAKE= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" PORTDOCS= README diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index d2999982dde0..e3db1b53aac6 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -41,7 +41,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_LDCONFIG= yes LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 56f97f75e694..8e5e582cbea3 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -58,7 +58,7 @@ PREFIX= ${KDE_PREFIX} USE_LDCONFIG= ${PREFIX}/lib/kde3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+=--disable-ltdl-install \ --disable-as-needed \ --enable-mt \ diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile index 50a34872e8ed..742885c5fb0a 100644 --- a/x11/kxgenerator/Makefile +++ b/x11/kxgenerator/Makefile @@ -16,7 +16,7 @@ COMMENT= KDE utility to configure the X server USE_BZIP2= yes USE_KDEBASE_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_ICONS= yes diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile index ff2f27fdbd81..36215b86fdc1 100644 --- a/x11/libSM/Makefile +++ b/x11/libSM/Makefile @@ -16,7 +16,7 @@ COMMENT= Session Management library for X11 BUILD_DEPENDS= ${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing XORG_CAT= lib diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 538d9c380c6a..d0bcf1ca34bf 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb.pc:${PORTSDIR}/x11/libxcb XORG_CAT= lib USE_XORG= bigreqsproto xau xcmiscproto xdmcp xextproto xtrans \ kbproto:both inputproto xf86bigfontproto xproto:both -USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15 +USE_AUTOTOOLS= aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:22 ACLOCAL_ARGS= -I . -I ${LOCALBASE}/share/aclocal AUTOMAKE_ARGS= --add-missing CONFIGURE_ARGS+= --datadir=${PREFIX}/lib \ diff --git a/x11/libXTrap/Makefile b/x11/libXTrap/Makefile index de3888f4cfaa..8651ac199680 100644 --- a/x11/libXTrap/Makefile +++ b/x11/libXTrap/Makefile @@ -14,6 +14,6 @@ COMMENT= The XTrap library XORG_CAT= lib USE_XORG= trapproto:both x11 xext xextproto xt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11/libXinerama/Makefile b/x11/libXinerama/Makefile index 60e3f47df1f0..70b0496790c4 100644 --- a/x11/libXinerama/Makefile +++ b/x11/libXinerama/Makefile @@ -15,7 +15,7 @@ COMMENT= X11 Xinerama library XORG_CAT= lib USE_XORG= x11 xext xextproto xineramaproto:both -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN3= Xinerama.3 \ XineramaQueryExtension.3 \ diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile index 570d7245dced..16270d3a20a7 100644 --- a/x11/libXp/Makefile +++ b/x11/libXp/Makefile @@ -15,7 +15,7 @@ COMMENT= X print library XORG_CAT= lib USE_XORG= x11 xext xextproto xau printproto:both -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN3= XpCancelDoc.3 \ XpCancelJob.3 \ diff --git a/x11/libXprintAppUtil/Makefile b/x11/libXprintAppUtil/Makefile index 14aa8e7b6023..6a2f271d16a7 100644 --- a/x11/libXprintAppUtil/Makefile +++ b/x11/libXprintAppUtil/Makefile @@ -14,6 +14,6 @@ COMMENT= The XprintAppUtil library XORG_CAT= lib USE_XORG= printproto x11 xau xp xprintutil xproto:both -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11/libXprintUtil/Makefile b/x11/libXprintUtil/Makefile index c737e85cb528..9e87e7df8bd3 100644 --- a/x11/libXprintUtil/Makefile +++ b/x11/libXprintUtil/Makefile @@ -14,6 +14,6 @@ COMMENT= The XprintUtil library XORG_CAT= lib USE_XORG= printproto:both x11 xau xp xt -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11/libXtst/Makefile b/x11/libXtst/Makefile index f9aaf7d60a49..98d0dda564d7 100644 --- a/x11/libXtst/Makefile +++ b/x11/libXtst/Makefile @@ -15,7 +15,7 @@ COMMENT= X Test extension XORG_CAT= lib USE_XORG= x11 xext recordproto:both xextproto inputproto:both -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN3= XTestQueryExtension.3 \ XTestCompareCursorWithWindow.3 \ diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index cf2ef638f937..02bb0d01e0e6 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -30,7 +30,7 @@ USE_GNOME= gnomeprefix gnomehack intlhack esound libbonobo \ USE_BISON= build USE_XORG= xpm USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile index b8805ec0e5ac..f1aa98c3c3e1 100644 --- a/x11/libgnomekbd/Makefile +++ b/x11/libgnomekbd/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= xklavier.12:${PORTSDIR}/x11/libxklavier \ USE_BZIP2= yes USE_GNOME= gnomeprefix gnomehack ltverhack gconf2 libglade2 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 INSTALLS_ICONS= yes USE_GETTEXT= yes USE_LDCONFIG= yes diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile index 14e003324282..54fb81d32e5c 100644 --- a/x11/libgnomemm/Makefile +++ b/x11/libgnomemm/Makefile @@ -18,7 +18,7 @@ COMMENT= C++ wrapper for libgnome library LIB_DEPENDS= gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack libgnome GNU_CONFIGURE= yes diff --git a/x11/liboldX/Makefile b/x11/liboldX/Makefile index 70ac3c47dc4f..14ca23431b9b 100644 --- a/x11/liboldX/Makefile +++ b/x11/liboldX/Makefile @@ -14,6 +14,6 @@ COMMENT= Old X library XORG_CAT= lib USE_XORG= x11 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 .include <bsd.port.mk> diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile index 7595a8dfbc96..3300c691b2ad 100644 --- a/x11/libxfce4menu/Makefile +++ b/x11/libxfce4menu/Makefile @@ -15,7 +15,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= XFce 4 library for a freedesktop.org compliant menu implementation -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index c9edf268a199..ea5deb62693c 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -14,7 +14,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= oliver@FreeBSD.org COMMENT= XFce 4 library with non-graphical helper functions -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile index 876c0abcfb1d..39f476385a79 100644 --- a/x11/libxklavier/Makefile +++ b/x11/libxklavier/Makefile @@ -25,7 +25,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_GNOME= gnomehack libxml2 glib20 ltverhack:12 USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --disable-doxygen \ --with-xkb-base=${LOCALBASE}/share/X11/xkb \ diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index 69c4a88848cd..501bdafc12a3 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft USE_XORG= sm USE_GNOME= gtk20 lthack -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 LIBTOOLFILES= configure kiklib/configure mkf/configure USE_PERL5_BUILD=yes USE_GETTEXT= yes diff --git a/x11/oooqs/Makefile b/x11/oooqs/Makefile index b675a9a92981..9b906745c52a 100644 --- a/x11/oooqs/Makefile +++ b/x11/oooqs/Makefile @@ -13,7 +13,7 @@ MASTER_SITES= http://download.berlios.de/segfaultskde/ MAINTAINER= itetcu@people.tecnik93.com COMMENT= Quick launcher for Open Office -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_KDELIBS_VER= 3 USE_GMAKE= yes diff --git a/x11/oooqs2/Makefile b/x11/oooqs2/Makefile index 3b9b46e6bb43..9a8be8403ffe 100644 --- a/x11/oooqs2/Makefile +++ b/x11/oooqs2/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= http://download.berlios.de/segfaultskde/ \ MAINTAINER= citycat4@ngs.ru COMMENT= KDE Quick launcher for Open Office 2.x -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 CONFIGURE_ARGS+= --with-qt-dir=${QT_PREFIX} diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 09dcfacb9380..51c61d570c1c 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -13,7 +13,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= Low-level pixel manipulation library XORG_CAT= lib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5_BUILD=yes USE_GNOME= ltverhack:9 diff --git a/x11/rsibreak-kde4/Makefile b/x11/rsibreak-kde4/Makefile index 84e319d445cc..20eb0c3116e0 100644 --- a/x11/rsibreak-kde4/Makefile +++ b/x11/rsibreak-kde4/Makefile @@ -16,7 +16,7 @@ COMMENT= A KDE RSI prevention tool USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes INSTALLS_ICONS= yes USE_XORG= xscrnsaver diff --git a/x11/rsibreak/Makefile b/x11/rsibreak/Makefile index 84e319d445cc..20eb0c3116e0 100644 --- a/x11/rsibreak/Makefile +++ b/x11/rsibreak/Makefile @@ -16,7 +16,7 @@ COMMENT= A KDE RSI prevention tool USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GETTEXT= yes INSTALLS_ICONS= yes USE_XORG= xscrnsaver diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile index c2f5b11a27b4..e9830c055a55 100644 --- a/x11/rxvt-devel/Makefile +++ b/x11/rxvt-devel/Makefile @@ -17,7 +17,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= akosela@andykosela.com COMMENT= A low memory usage xterm replacement that supports color -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_PERL5_BUILD=yes USE_XORG= xpm GNU_CONFIGURE= yes diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile index ad923f310335..ea9a402f6e10 100644 --- a/x11/startup-notification/Makefile +++ b/x11/startup-notification/Makefile @@ -17,7 +17,7 @@ COMMENT= Library that supports startup notification spec from freedesktop.org LIB_DEPENDS= xcb-aux.0:${PORTSDIR}/x11/xcb-util USE_XORG= x11 -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes USE_GNOME= gnomehack gnometarget pkgconfig GNU_CONFIGURE= yes diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile index bba039a65e11..01a4fb648015 100644 --- a/x11/xcb-util/Makefile +++ b/x11/xcb-util/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_GMAKE= yes USE_LDCONFIG= yes USE_XORG= xau xdmcp -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile index 1b5d1ba6f95c..ffffdfcf7c41 100644 --- a/x11/xfce4-conf/Makefile +++ b/x11/xfce4-conf/Makefile @@ -18,7 +18,7 @@ COMMENT= XFce 4 configuration mananger LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 GNU_CONFIGURE= yes USE_BZIP2= yes USE_GETTEXT= yes diff --git a/x11/xrx/Makefile b/x11/xrx/Makefile index b64bb6925d3c..d3f92e777c91 100644 --- a/x11/xrx/Makefile +++ b/x11/xrx/Makefile @@ -16,7 +16,7 @@ COMMENT= RX helper program XORG_CAT= app USE_XORG= x11 xt xext xtrans xproxymngproto xau xaw USE_LDCONFIG= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 MAN1= xrx.1 libxrx.1 diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile index 7a66c0ff282d..faf2f0fd7f8b 100644 --- a/x11/xscreensaver-kde/Makefile +++ b/x11/xscreensaver-kde/Makefile @@ -24,7 +24,7 @@ USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} USE_BZIP2= yes -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_GMAKE= yes WRKSRC= ${WRKDIR}/kdeartwork-${PORTVERSION} diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile index 97ff1055da3d..1b13587393b5 100644 --- a/x11/yakuake/Makefile +++ b/x11/yakuake/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= BERLIOS MAINTAINER= decept0@gmail.com COMMENT= Quake-style terminal emulator based on KDE's Konsole -USE_AUTOTOOLS= libtool:15 +USE_AUTOTOOLS= libtool:22 USE_BZIP2= yes USE_KDEBASE_VER=3 USE_GMAKE= yes |