Date: Fri, 25 Sep 2009 09:47:29 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r116 - in branches/experimental/mail/thunderbird-devel: . files Message-ID: <200909250947.n8P9lTol068797@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Fri Sep 25 09:47:28 2009
New Revision: 116
Log:
- Move execution of AUTOCONF from post-extract to pre-configure
- Pet portlint
Added:
branches/experimental/mail/thunderbird-devel/files/patch-configure.in
- copied, changed from r114, branches/experimental/mail/thunderbird-devel/files/patch-configure
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in
- copied, changed from r114, branches/experimental/mail/thunderbird-devel/files/patch-configure
Deleted:
branches/experimental/mail/thunderbird-devel/files/patch-configure
Modified:
branches/experimental/mail/thunderbird-devel/Makefile
branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
Modified: branches/experimental/mail/thunderbird-devel/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-devel/Makefile Thu Sep 24 11:42:05 2009 (r115)
+++ branches/experimental/mail/thunderbird-devel/Makefile Fri Sep 25 09:47:28 2009 (r116)
@@ -15,7 +15,6 @@
MAINTAINER= gecko@FreeBSD.org
COMMENT= Mozilla Thunderbird is standalone mail and news that stands above
-EXTRACT_DEPENDS= autoconf-2.13:${PORTSDIR}/devel/autoconf213
BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
USE_AUTOTOOLS= autoconf:213
@@ -80,9 +79,6 @@
.endif
post-extract::
- (cd ${WRKSRC} && ${AUTOCONF})
- (cd ${MOZSRC} && ${AUTOCONF})
- (cd ${MOZSRC}/js/src/ && ${AUTOCONF})
${SED} -e 's|@MOZILLA_ICON@|${MOZILLA_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA}.desktop
@@ -102,11 +98,16 @@
s|/usr/X11R6|${LOCALBASE}|g' \
${MOZSRC}/js/src/configure
+pre-configure:
+ (cd ${WRKSRC} && ${AUTOCONF})
+ (cd ${MOZSRC} && ${AUTOCONF})
+ (cd ${MOZSRC}/js/src/ && ${AUTOCONF})
+
port-pre-install:
${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
${FAKEDIR}/bin/thunderbird
${RM} -f ${FAKEDIR}/bin/*.bak
- ${MKDIR} -p ${FAKEDIR}/lib/${PORTNAME}/defaults
+ ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
pre-install:
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
Deleted: branches/experimental/mail/thunderbird-devel/files/patch-configure
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-configure Fri Sep 25 09:47:28 2009 (r115)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- configure.orig 2009-08-14 11:24:58.206076928 +0200
-+++ configure 2009-08-14 11:25:29.601293359 +0200
-@@ -5680,7 +5680,7 @@
- CPU_ARCH=sparc
- ;;
-
--x86_64 | ia64)
-+amd64 | x86_64 | ia64)
- CPU_ARCH="$OS_TEST"
- ;;
- esac
Copied and modified: branches/experimental/mail/thunderbird-devel/files/patch-configure.in (from r114, branches/experimental/mail/thunderbird-devel/files/patch-configure)
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-configure Mon Sep 21 23:06:03 2009 (r114, copy source)
+++ branches/experimental/mail/thunderbird-devel/files/patch-configure.in Fri Sep 25 09:47:28 2009 (r116)
@@ -1,5 +1,5 @@
---- configure.orig 2009-08-14 11:24:58.206076928 +0200
-+++ configure 2009-08-14 11:25:29.601293359 +0200
+--- configure.in.orig 2009-08-14 11:24:58.206076928 +0200
++++ configure.in 2009-08-14 11:25:29.601293359 +0200
@@ -5680,7 +5680,7 @@
CPU_ARCH=sparc
;;
Copied and modified: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in (from r114, branches/experimental/mail/thunderbird-devel/files/patch-configure)
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-configure Mon Sep 21 23:06:03 2009 (r114, copy source)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-configure.in Fri Sep 25 09:47:28 2009 (r116)
@@ -1,5 +1,5 @@
---- configure.orig 2009-08-14 11:24:58.206076928 +0200
-+++ configure 2009-08-14 11:25:29.601293359 +0200
+--- mozilla/configure.in.orig 2009-08-14 11:24:58.206076928 +0200
++++ mozilla/configure.in 2009-08-14 11:25:29.601293359 +0200
@@ -5680,7 +5680,7 @@
CPU_ARCH=sparc
;;
Modified: branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in Thu Sep 24 11:42:05 2009 (r115)
+++ branches/experimental/mail/thunderbird-devel/files/patch-mozilla-js-src-configure.in Fri Sep 25 09:47:28 2009 (r116)
@@ -1,5 +1,5 @@
---- mozilla/js/src/configure.orig 2009-09-17 11:09:10.000000000 +0200
-+++ mozilla/js/src/configure 2009-09-17 11:09:33.000000000 +0200
+--- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200
++++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200
@@ -2467,10 +2467,6 @@
ENABLE_JIT=1
NANOJIT_ARCH=ARM
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909250947.n8P9lTol068797>