mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

- Introduce MOZSRC variable in bsd.gecko.mk. This change is needed for the

Browse Source 
upcoming update of SeaMonkey 2 and Thunderbird 3 because they changed
  the distribution format. By default MOZSRC is equal to WRKSRC which is
  set to ${WRKDIR}/mozilla and reflect the old behaviour.
  In SeaMonkey 2 and Thunderbird 3 MOZSRC is set to the mozilla directory
  which is a subdirectory of WRKSRC.
- Remove MCom header.

Submitted by:	Florian Smeets <flo AT kasimir.com> (via private mail. Thanks!)
Exp-run by:	miwi
This commit is contained in:
Beat Gaetzi 2009-11-28 10:38:01 +00:00
parent 9e811c372a
commit 289c331088
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=244902
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Mk/bsd.gecko.mk
View File

@ -5,7 +5,6 @@
# Whom: Michael Johnson <ahze@FreeBSD.org> # Whom: Michael Johnson <ahze@FreeBSD.org>
# #
# $FreeBSD$ # $FreeBSD$
# $MCom: ports/Mk/bsd.gecko.mk,v 1.10 2009/04/04 19:54:48 marcus Exp $
# #
# 4 column tabs prevent hair loss and tooth decay! # 4 column tabs prevent hair loss and tooth decay!
@ -65,7 +64,7 @@ Gecko_Pre_Include= bsd.gecko.mk
# #
# post-patch: # post-patch:
# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ # @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
# ${WRKSRC}/configure # ${MOZSRC}/configure
# #
# If you want your port to check the ${GECKO} variable to see which backend # If you want your port to check the ${GECKO} variable to see which backend
# has been chosen. # has been chosen.
@ -76,7 +75,7 @@ Gecko_Pre_Include= bsd.gecko.mk
# post-patch: # post-patch:
# .if ${GECKO}=="seamonkey" # .if ${GECKO}=="seamonkey"
# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ # @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \
# ${WRKSRC}/configure # ${MOZSRC}/configure
# .endif # .endif
_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \ _GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock mozilla \
@ -258,6 +257,7 @@ USE_XORG= printproto sm xt xi xext x11 xinerama \
ice xproto ice xproto
MOZILLA_SUFX?= none MOZILLA_SUFX?= none
MOZSRC?= ${WRKSRC}
WRKSRC?= ${WRKDIR}/mozilla WRKSRC?= ${WRKDIR}/mozilla
FAKEDIR?= ${WRKDIR}/fake FAKEDIR?= ${WRKDIR}/fake
PLIST?= ${WRKDIR}/plist PLIST?= ${WRKDIR}/plist
@ -501,17 +501,17 @@ gecko-post-patch:
@${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \
s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|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' \ @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
${WRKSRC}/configure \ ${WRKSRC}/configure \
${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${MOZSRC}/intl/uconv/native/nsNativeUConvService.cpp \
${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp ${MOZSRC}/xpcom/io/nsNativeCharsetUtils.cpp
@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \
${WRKSRC}/config/autoconf.mk.in ${WRKSRC}/config/autoconf.mk.in
@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \ @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \ s|echo aout|echo elf|g ; s|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/security/coreconf/FreeBSD.mk \ ${MOZSRC}/security/coreconf/FreeBSD.mk \
${WRKSRC}/js/src/Makefile.in ${MOZSRC}/js/src/Makefile.in
@if [ -d ${WRKSRC}/directory/c-sdk ]; then \ @if [ -d ${WRKSRC}/directory/c-sdk ]; then \
${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
@ -524,14 +524,14 @@ gecko-post-patch:
${WRKSRC}/configure ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|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' \ @${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' \ @${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 ; \ @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \
s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp ${MOZSRC}/xpcom/*/SpecialSystemDirectory.cpp
# handles mozilla pis scripts. # handles mozilla pis scripts.
gecko-moz-pis-patch: gecko-moz-pis-patch:
@ -542,13 +542,13 @@ gecko-moz-pis-patch:
post-configure: gecko-post-configure post-configure: gecko-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 post-build: gecko-post-build
gecko-post-build: gecko-post-build:
@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2|" \ @${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 pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist
@ -561,7 +561,7 @@ gecko-pre-install:
.if !defined(NOGECKO_PLIST) .if !defined(NOGECKO_PLIST)
@${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF} @${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF}
@${TOUCH} -f ${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} ${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none" .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA} ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}