From 9487d820b3247d8654d99544f8144188dcec810a Mon Sep 17 00:00:00 2001 From: ade Date: Thu, 26 Jun 2003 22:58:32 +0000 Subject: libtool uber-patch * kill devel/libtool and move to devel/libtool13, upgrading to 1.3.5 * upgrade repo-copied devel/libtool14 to 1.4.3 * break out libltdl into its own separate port * move to version-numbered binaries/scripts (ie: there is *no* 'libtool' any more -- USE_LIBTOOL and USE_LIBTOOL_VER are your friends) Approved by: portmgr (kris) - for the bsd.port.mk hooks Tested by: bento 4-exp builds (repeatedly) --- mail/balsa2/Makefile | 5 +++-- mail/pop3lite/Makefile | 2 +- mail/sylpheed/Makefile | 2 +- mail/sylpheed2-devel/Makefile | 2 +- mail/sylpheed2/Makefile | 2 +- mail/sylpheed3/Makefile | 2 +- mail/xfmail/Makefile | 8 +------- 7 files changed, 9 insertions(+), 14 deletions(-) (limited to 'mail') diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index b1ddd61..eabd32e 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -7,7 +7,7 @@ PORTNAME= balsa2 PORTVERSION= 2.0.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail gnome MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/ \ ftp://ftp.newton.cx/pub/balsa/ @@ -21,7 +21,8 @@ LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \ aspell.15:${PORTSDIR}/textproc/aspell \ pcre.0:${PORTSDIR}/devel/pcre \ esmtp.6:${PORTSDIR}/mail/libesmtp \ - gdbm.3:${PORTSDIR}/databases/gdbm + gdbm.3:${PORTSDIR}/databases/gdbm \ + ltdl.4:${PORTSDIR}/devel/libltdl RUN_DEPENDS= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell USE_BZIP2= yes diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile index 22390d1..f0b0e97 100644 --- a/mail/pop3lite/Makefile +++ b/mail/pop3lite/Makefile @@ -23,6 +23,6 @@ MAN5= pop3lite.conf.5 MAN8= pop3lite.8 pre-build: - @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}/libtool + @${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool .include diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 54932f3..194092d 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -102,7 +102,7 @@ post-patch: .endif pre-build: - ${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool + ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile index 54932f3..194092d 100644 --- a/mail/sylpheed2-devel/Makefile +++ b/mail/sylpheed2-devel/Makefile @@ -102,7 +102,7 @@ post-patch: .endif pre-build: - ${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool + ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed2/Makefile b/mail/sylpheed2/Makefile index 54932f3..194092d 100644 --- a/mail/sylpheed2/Makefile +++ b/mail/sylpheed2/Makefile @@ -102,7 +102,7 @@ post-patch: .endif pre-build: - ${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool + ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile index 54932f3..194092d 100644 --- a/mail/sylpheed3/Makefile +++ b/mail/sylpheed3/Makefile @@ -102,7 +102,7 @@ post-patch: .endif pre-build: - ${LN} -sf ${LOCALBASE}/bin/${LIBTOOL} ${WRKSRC}/libtool + ${LN} -sf ${LIBTOOL} ${WRKSRC}/libtool post-install: .if !defined(NOPORTDOCS) diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 4292508..9b9cbf4 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -18,8 +18,6 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-rc1 MAINTAINER= mikeh@FreeBSD.org COMMENT= An X Window System application for receiving electronic mail -BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf - LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ gdbm.3:${PORTSDIR}/databases/gdbm @@ -32,10 +30,6 @@ USE_LIBTOOL= yes USE_X_PREFIX= yes USE_XPM= yes -AUTOCONF= autoconf -AUTOHEADER= autoheader -ACLOCAL= aclocal - # XXX: Disable patching for libtool until we can generate the files LIBTOOLFILES= @@ -82,7 +76,7 @@ pre-everything:: @echo pre-configure: - @(cd ${WRKSRC} && ${SH} autogen.sh); \ + @(cd ${WRKSRC} && ${ENV} ${SCRIPTS_ENV} ${SH} autogen.sh); \ ${MAKE} LIBTOOLFILES=aclocal.m4 patch-libtool .include -- cgit v1.1