Date: Sat, 28 Nov 2009 15:10:17 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r175 - trunk/Mk Message-ID: <200911281510.nASFAHsp031058@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Sat Nov 28 15:10:16 2009
New Revision: 175
Log:
Sync with ports:
- Chase jpeg update
- Introduce MOZSRC
Modified:
trunk/Mk/bsd.gecko.mk
Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Nov 26 12:43:22 2009 (r174)
+++ trunk/Mk/bsd.gecko.mk Sat Nov 28 15:10:16 2009 (r175)
@@ -4,8 +4,7 @@
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.12 2009/05/04 19:23:41 miwi Exp $
-# $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $
+# $FreeBSD: ports/Mk/bsd.gecko.mk,v 1.15 2009/11/28 10:38:01 beat Exp $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -65,7 +64,7 @@
#
# post-patch:
# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
-# ${WRKSRC}/configure
+# ${MOZSRC}/configure
#
# If you want your port to check the ${GECKO} variable to see which backend
# has been chosen.
@@ -76,7 +75,7 @@
# post-patch:
# .if ${GECKO}=="seamonkey"
# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \
-# ${WRKSRC}/configure
+# ${MOZSRC}/configure
# .endif
_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \
@@ -258,6 +257,7 @@
ice xproto
MOZILLA_SUFX?= none
+MOZSRC?= ${WRKSRC}
WRKSRC?= ${WRKDIR}/mozilla
FAKEDIR?= ${WRKDIR}/fake
PLIST?= ${WRKDIR}/plist
@@ -320,7 +320,7 @@
dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm
-jpeg_LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
+jpeg_LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg
jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE}
jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg
@@ -501,17 +501,17 @@
@${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \
s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
- ${WRKSRC}/build/unix/mozilla-config.in
+ ${MOZSRC}/build/unix/mozilla-config.in
@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
${WRKSRC}/configure \
- ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
- ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+ ${MOZSRC}/intl/uconv/native/nsNativeUConvService.cpp \
+ ${MOZSRC}/xpcom/io/nsNativeCharsetUtils.cpp
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
- ${WRKSRC}/security/coreconf/FreeBSD.mk \
- ${WRKSRC}/js/src/Makefile.in
+ ${MOZSRC}/security/coreconf/FreeBSD.mk \
+ ${MOZSRC}/js/src/Makefile.in
@if [ -d ${WRKSRC}/directory/c-sdk ]; then \
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
@@ -524,14 +524,14 @@
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/build/unix/run-mozilla.sh
+ ${MOZSRC}/build/unix/run-mozilla.sh
@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
- ${WRKSRC}/widget/src/gtk2/nsSound.cpp
+ ${MOZSRC}/widget/src/gtk2/nsSound.cpp
@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
- ${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp
+ ${MOZSRC}/*/*/*/nsDeviceContextSpecG.cpp
@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
- ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
+ ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
# handles mozilla pis scripts.
gecko-moz-pis-patch:
@@ -542,13 +542,13 @@
post-configure: gecko-post-configure
gecko-post-configure:
- @${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/mozilla-config.h
+ @${ECHO_CMD} "#define JNIIMPORT" >> ${MOZSRC}/mozilla-config.h
post-build: gecko-post-build
gecko-post-build:
@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \
- ${WRKSRC}/build/unix/*.pc || ${TRUE}
+ ${MOZSRC}/build/unix/*.pc || ${TRUE}
pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
@@ -561,7 +561,7 @@
.if !defined(NOGECKO_PLIST)
@${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF}
@${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF}
- @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+ @cd ${MOZSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911281510.nASFAHsp031058>