mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 13:20:32 -04:00
Convert all but one port that uses libtool14 to use libtool15, in readiness
for the destruction of devel/libtool14
This commit is contained in:
parent
64aa23f444
commit
2c577f8a04
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=105149
16 changed files with 73 additions and 49 deletions
|
@ -24,7 +24,7 @@ BUILD_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
|
||||||
|
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
|
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/builds
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER=15
|
||||||
CONFIGURE_SCRIPT= ../unix/configure
|
CONFIGURE_SCRIPT= ../unix/configure
|
||||||
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
|
LIBTOOLFILES= ${CONFIGURE_SCRIPT}
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
|
|
|
@ -22,7 +22,7 @@ WRKSRCMASTER= ${WRKDIR}/multisync-${PORTVERSION}
|
||||||
USE_BZIP2= yes
|
USE_BZIP2= yes
|
||||||
USE_GNOME= gnomehack gnomeprefix libgnomeui
|
USE_GNOME= gnomehack gnomeprefix libgnomeui
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER=15
|
||||||
USE_X_PREFIX= yes
|
USE_X_PREFIX= yes
|
||||||
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
|
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
|
||||||
|
|
||||||
|
@ -38,6 +38,6 @@ post-patch:
|
||||||
's|-lpthread||'
|
's|-lpthread||'
|
||||||
|
|
||||||
post-configure:
|
post-configure:
|
||||||
${CP} ${LOCALBASE}/bin/libtool14 ${WRKSRC}/libtool
|
${CP} ${LIBTOOL} ${WRKSRC}/libtool
|
||||||
|
|
||||||
.include <bsd.port.mk>
|
.include <bsd.port.mk>
|
||||||
|
|
|
@ -29,10 +29,10 @@ COMMENT= The Apache Group's Portability Library
|
||||||
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
||||||
iconv.3:${PORTSDIR}/converters/libiconv
|
iconv.3:${PORTSDIR}/converters/libiconv
|
||||||
|
|
||||||
USE_AUTOCONF_VER= 253
|
USE_AUTOCONF_VER= 257
|
||||||
USE_PERL5= yes
|
USE_PERL5= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
LIBTOOLFILES= # none
|
LIBTOOLFILES= # none
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
--- apr-0.9.4/buildconf.orig Wed Jun 18 05:44:25 2003
|
--- apr-0.9.4/buildconf.orig Tue Jun 17 13:44:25 2003
|
||||||
+++ apr-0.9.4/buildconf Thu Oct 2 15:58:45 2003
|
+++ apr-0.9.4/buildconf Tue Mar 23 21:53:36 2004
|
||||||
@@ -81,7 +81,7 @@
|
@@ -83,3 +83,3 @@
|
||||||
$libtoolize --copy --automake
|
|
||||||
|
|
||||||
ltpath=`dirname $libtoolize`
|
ltpath=`dirname $libtoolize`
|
||||||
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
||||||
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4}
|
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool15.m4}
|
||||||
|
|
||||||
|
@@ -102,3 +102,3 @@
|
||||||
|
echo "Creating include/arch/unix/apr_private.h.in ..."
|
||||||
|
-${AUTOHEADER:-autoheader}
|
||||||
|
+${AUTOHEADER:-autoheader257}
|
||||||
|
|
||||||
|
@@ -106,3 +106,3 @@
|
||||||
|
### do some work to toss config.cache?
|
||||||
|
-${AUTOCONF:-autoconf}
|
||||||
|
+${AUTOCONF:-autoconf257}
|
||||||
|
|
||||||
if [ ! -f $ltfile ]; then
|
|
||||||
echo "$ltfile not found"
|
|
||||||
|
|
|
@ -29,10 +29,10 @@ COMMENT= The Apache Group's Portability Library
|
||||||
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
||||||
iconv.3:${PORTSDIR}/converters/libiconv
|
iconv.3:${PORTSDIR}/converters/libiconv
|
||||||
|
|
||||||
USE_AUTOCONF_VER= 253
|
USE_AUTOCONF_VER= 257
|
||||||
USE_PERL5= yes
|
USE_PERL5= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
LIBTOOLFILES= # none
|
LIBTOOLFILES= # none
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
--- apr-0.9.4/buildconf.orig Wed Jun 18 05:44:25 2003
|
--- apr-0.9.4/buildconf.orig Tue Jun 17 13:44:25 2003
|
||||||
+++ apr-0.9.4/buildconf Thu Oct 2 15:58:45 2003
|
+++ apr-0.9.4/buildconf Tue Mar 23 21:53:36 2004
|
||||||
@@ -81,7 +81,7 @@
|
@@ -83,3 +83,3 @@
|
||||||
$libtoolize --copy --automake
|
|
||||||
|
|
||||||
ltpath=`dirname $libtoolize`
|
ltpath=`dirname $libtoolize`
|
||||||
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
||||||
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4}
|
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool15.m4}
|
||||||
|
|
||||||
|
@@ -102,3 +102,3 @@
|
||||||
|
echo "Creating include/arch/unix/apr_private.h.in ..."
|
||||||
|
-${AUTOHEADER:-autoheader}
|
||||||
|
+${AUTOHEADER:-autoheader257}
|
||||||
|
|
||||||
|
@@ -106,3 +106,3 @@
|
||||||
|
### do some work to toss config.cache?
|
||||||
|
-${AUTOCONF:-autoconf}
|
||||||
|
+${AUTOCONF:-autoconf257}
|
||||||
|
|
||||||
if [ ! -f $ltfile ]; then
|
|
||||||
echo "$ltfile not found"
|
|
||||||
|
|
|
@ -29,10 +29,10 @@ COMMENT= The Apache Group's Portability Library
|
||||||
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
||||||
iconv.3:${PORTSDIR}/converters/libiconv
|
iconv.3:${PORTSDIR}/converters/libiconv
|
||||||
|
|
||||||
USE_AUTOCONF_VER= 253
|
USE_AUTOCONF_VER= 257
|
||||||
USE_PERL5= yes
|
USE_PERL5= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
LIBTOOLFILES= # none
|
LIBTOOLFILES= # none
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
--- apr-0.9.4/buildconf.orig Wed Jun 18 05:44:25 2003
|
--- apr-0.9.4/buildconf.orig Tue Jun 17 13:44:25 2003
|
||||||
+++ apr-0.9.4/buildconf Thu Oct 2 15:58:45 2003
|
+++ apr-0.9.4/buildconf Tue Mar 23 21:53:36 2004
|
||||||
@@ -81,7 +81,7 @@
|
@@ -83,3 +83,3 @@
|
||||||
$libtoolize --copy --automake
|
|
||||||
|
|
||||||
ltpath=`dirname $libtoolize`
|
ltpath=`dirname $libtoolize`
|
||||||
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
||||||
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4}
|
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool15.m4}
|
||||||
|
|
||||||
|
@@ -102,3 +102,3 @@
|
||||||
|
echo "Creating include/arch/unix/apr_private.h.in ..."
|
||||||
|
-${AUTOHEADER:-autoheader}
|
||||||
|
+${AUTOHEADER:-autoheader257}
|
||||||
|
|
||||||
|
@@ -106,3 +106,3 @@
|
||||||
|
### do some work to toss config.cache?
|
||||||
|
-${AUTOCONF:-autoconf}
|
||||||
|
+${AUTOCONF:-autoconf257}
|
||||||
|
|
||||||
if [ ! -f $ltfile ]; then
|
|
||||||
echo "$ltfile not found"
|
|
||||||
|
|
|
@ -29,10 +29,10 @@ COMMENT= The Apache Group's Portability Library
|
||||||
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2 \
|
||||||
iconv.3:${PORTSDIR}/converters/libiconv
|
iconv.3:${PORTSDIR}/converters/libiconv
|
||||||
|
|
||||||
USE_AUTOCONF_VER= 253
|
USE_AUTOCONF_VER= 257
|
||||||
USE_PERL5= yes
|
USE_PERL5= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
LIBTOOLFILES= # none
|
LIBTOOLFILES= # none
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
|
|
|
@ -1,11 +1,17 @@
|
||||||
--- apr-0.9.4/buildconf.orig Wed Jun 18 05:44:25 2003
|
--- apr-0.9.4/buildconf.orig Tue Jun 17 13:44:25 2003
|
||||||
+++ apr-0.9.4/buildconf Thu Oct 2 15:58:45 2003
|
+++ apr-0.9.4/buildconf Tue Mar 23 21:53:36 2004
|
||||||
@@ -81,7 +81,7 @@
|
@@ -83,3 +83,3 @@
|
||||||
$libtoolize --copy --automake
|
|
||||||
|
|
||||||
ltpath=`dirname $libtoolize`
|
ltpath=`dirname $libtoolize`
|
||||||
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
|
||||||
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool14.m4}
|
+ltfile=${LIBTOOL_M4-`cd $ltpath/../../share/aclocal ; pwd`/libtool15.m4}
|
||||||
|
|
||||||
|
@@ -102,3 +102,3 @@
|
||||||
|
echo "Creating include/arch/unix/apr_private.h.in ..."
|
||||||
|
-${AUTOHEADER:-autoheader}
|
||||||
|
+${AUTOHEADER:-autoheader257}
|
||||||
|
|
||||||
|
@@ -106,3 +106,3 @@
|
||||||
|
### do some work to toss config.cache?
|
||||||
|
-${AUTOCONF:-autoconf}
|
||||||
|
+${AUTOCONF:-autoconf257}
|
||||||
|
|
||||||
if [ ! -f $ltfile ]; then
|
|
||||||
echo "$ltfile not found"
|
|
||||||
|
|
|
@ -62,7 +62,7 @@ CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[02-9].*
|
||||||
|
|
||||||
USE_OPENSSL= yes
|
USE_OPENSSL= yes
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
|
|
||||||
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
||||||
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
||||||
|
|
|
@ -62,7 +62,7 @@ CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].*
|
||||||
|
|
||||||
USE_OPENSSL= yes
|
USE_OPENSSL= yes
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
|
|
||||||
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
||||||
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
||||||
|
|
|
@ -62,7 +62,7 @@ CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].*
|
||||||
|
|
||||||
USE_OPENSSL= yes
|
USE_OPENSSL= yes
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
|
|
||||||
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
||||||
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
||||||
|
|
|
@ -62,7 +62,7 @@ CONFLICTS+= ${PKGNAMEPREFIX}${PORTNAME}-server-2.[013-9].*
|
||||||
|
|
||||||
USE_OPENSSL= yes
|
USE_OPENSSL= yes
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER= 15
|
||||||
|
|
||||||
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX}
|
||||||
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX}
|
||||||
|
|
|
@ -29,7 +29,7 @@ USE_REINPLACE= yes
|
||||||
USE_GMAKE= yes
|
USE_GMAKE= yes
|
||||||
GNU_CONFIGURE= yes
|
GNU_CONFIGURE= yes
|
||||||
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
|
||||||
USE_LIBTOOL_VER=14
|
USE_LIBTOOL_VER=15
|
||||||
INSTALLS_SHLIB= yes
|
INSTALLS_SHLIB= yes
|
||||||
|
|
||||||
PKGINSTALL= ${WRKDIR}/pkg-install
|
PKGINSTALL= ${WRKDIR}/pkg-install
|
||||||
|
|
|
@ -21,7 +21,7 @@ LIB_DEPENDS= ltdl.4:${PORTSDIR}/devel/libltdl
|
||||||
|
|
||||||
USE_BISON= yes
|
USE_BISON= yes
|
||||||
USE_REINPLACE= yes
|
USE_REINPLACE= yes
|
||||||
USE_LIBTOOL_VER= 14
|
USE_LIBTOOL_VER=15
|
||||||
CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
|
CONFIGURE_ARGS= --without-local-zlib --with-cflags="${CFLAGS}" \
|
||||||
--with-etcdir=${PREFIX}/etc
|
--with-etcdir=${PREFIX}/etc
|
||||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
|
|
Loading…
Add table
Reference in a new issue