diff options
author | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-23 05:29:16 +0800 |
---|---|---|
committer | ahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-23 05:29:16 +0800 |
commit | 3da7e283a2e577fdddfb140f1e29e82284988c19 (patch) | |
tree | 09c16082a5b441957e9b5ab7aca9eb85833c2f81 /www/seamonkey | |
parent | cdbb0ea9ca4bc1d9bc192750d8d25de141effd9a (diff) | |
download | marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar.gz marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar.bz2 marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar.lz marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar.xz marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.tar.zst marcuscom-ports-3da7e283a2e577fdddfb140f1e29e82284988c19.zip |
-- Marge lots of common mozilla-ports tasks into Makefile.common
o creation of plist (Disabled with NOGECKO_PLIST)
o install (Disabled with NOGECKO_INSTALL)
o many common post-patch routines
- Expand post- pre- targets so ports and Makefile.common can use the same
target
- Makefile.common supports both ${FILESDIR}/mozconfig.in (if exists) and
now has 3 new variables to add opions to .mozconfig [1]
Ports can use the following:
NOGECKO_INSTALL
NOGECKO_PLIST Do not auto-create plist
NOMOZCONFIG Use CONFIGURE_ARGS instead of .mozconfig
MOZILLA_PLIST_DIRS Listing of directories to create plist and/or
install
MOZ_PIS_SCRIPTS List scripts listed in ${FILESDIR} to filter
through MOZCONFIG_SED and install with mozilla
PIS scripts.
MOZ_SED_ARGS Add or replace to MOZ_SED_ARGS
[1]
MOZ_OPTIONS Add more configure arguments to .mozconfig
MOZ_MK_OPTIONS Add more make arguments to .mozconfig
MOZ_EXPORT Add export variables to .mozconfig
if ${FILESDIR}/mozconfig.in exists and NOMOZCONFIG is not defined
contents of ${FILESDIR}/mozconfig.in will be filtered through MOZCONFIG_SED
and added the the end of .mozconfig
I broke the following:
o Optional extensions (irc, etc) , need to figure out how to handle this
Todo:
o Handle .desktop the install of .desktop files and icons
o Handle Java plugins
o Cleanup/Audit and moving any other common "things" into Makefile.common
o (maybe) convert all the ${FILESDIR}/mozconfig.in to MOZ_OPTIONS/EXPORT
variables
o Add support for ports to set MOZILLA=PORTNAME-devel
o Figure out how to get the rest of mozconfig-generic.in to work in
MOZ_EXPORT, the following example does not work
MOZ_EXPORT=CFLAGS="${CFLAGS}"
if treats each flag in CFLAGS as a different flag and you end
up with a bunch of export -O2, export -xxx instead of
export -O2 -xxx -blah ....
o Figure out why MOZ_OPIONS+=--prefix=${FAKEDIR} ends up in
.mozconfig as --prefix=/fake instead of --prefix=${WRKDIR}/fake
(--prefix is in mozconfig-generic.in for now)
o testing testing TESTING
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5182 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/seamonkey')
-rw-r--r-- | www/seamonkey/Makefile | 130 | ||||
-rw-r--r-- | www/seamonkey/files/mozconfig.in | 7 | ||||
-rw-r--r-- | www/seamonkey/files/patch-config_autoconf.mk.in | 2 | ||||
-rw-r--r-- | www/seamonkey/files/seamonkey.sh | 85 |
4 files changed, 23 insertions, 201 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 73def8140..ffc5ceaa2 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/seamonkey/Makefile,v 1.30 2005/11/18 09:28:46 ahze Exp $ +# $MCom: ports/www/seamonkey/Makefile,v 1.31 2005/11/18 09:29:37 ahze Exp $ # PORTNAME?= seamonkey @@ -18,22 +18,24 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gnome@FreeBSD.org COMMENT= The open source, standards compliant web browser -MOZ_VER= 1.5a - USE_BZIP2= yes USE_GMAKE= yes WANT_GNOME= yes HAS_CONFIGURE= yes ALL_TARGET= default -SCRIPTS_DIR= ${FAKEDIR}/lib/${MOZILLA} -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d -MOZ_PIS_SCRIPTS= S50cleanhome +USE_X_PREFIX= yes +MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" MOZ_EXTENSIONS= default CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +MOZ_OPTIONS+= --enable-application=suite \ + --enable-svg-renderer=cairo \ + --enable-system-cairo +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite + OPTIONS=MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ @@ -42,18 +44,13 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \ SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> -.include "${.CURDIR}/../mozilla/Makefile.common" .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) # Glitz support can only be enabled if cairo is built with glitz support -CONFIGURE_ARGS+=--enable-glitz +MOZ_OPTIONS+= --enable-glitz LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz .endif -.if ${ARCH} == "ia64" || ${ARCH} == "alpha" -#BROKEN= Does not compile on ${ARCH} -.endif - .if ${ARCH} == "alpha" && ${OSVERSION} < 500035 IGNORE= core dumps on ${ARCH} during post-build .endif @@ -63,74 +60,53 @@ USE_GCC= 3.4+ .endif .if defined(WITHOUT_MAILNEWS) -CONFIGURE_ARGS+= --disable-ldap --disable-mailnews +MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) -CONFIGURE_ARGS+= --disable-ldap --enable-mailnews +MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else -CONFIGURE_ARGS+= --enable-ldap --enable-mailnews +MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .endif +.if 0 # TODO: Extensions are broken .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif CONFIGURE_ARGS+= --enable-extensions=${MOZ_EXTENSIONS} - +.endif .if defined(WITH_JAVASCRIPT_DEBUGGER) -CONFIGURE_ARGS+= --enable-jsd \ +MOZ_OPTIONS+= --enable-jsd \ --enable-dtd-debug .else -CONFIGURE_ARGS+= --disable-jsd \ +MOZ_OPTIONS+= --disable-jsd \ --disable-dtd-debug .endif .if defined(WITH_CALENDAR) -CONFIGURE_ARGS+= --enable-calendar +MOZ_OPTIONS+= --enable-calendar .endif .if defined(WITHOUT_COMPOSER) -CONFIGURE_ARGS+= --disable-composer +MOZ_OPTIONS+= --disable-composer .endif -.if ${ARCH} == "i386" -CONFIGURE_ARGS+= --enable-reorder -.endif +#.if ${ARCH} == "i386" +#CONFIGURE_ARGS+= --enable-reorder +#.endif post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - -e 's|%%HEADERS_SUFX%%|${MOZ_SUFX}|g' \ - ${WRKSRC}/config/autoconf.mk.in - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ ${WRKSRC}/configure \ ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \ - ${WRKSRC}/modules/libpref/src/init/all.js @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/seamonkey.desktop - ${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%MOZILLA%%|${MOZILLA}|g" \ - ${FILESDIR}/seamonkey.sh >${WRKSRC}/${MOZILLA} pre-install: - ${RM} -rf ${PLIST} ${FAKEDIR} - ${TOUCH} -f ${PLIST} - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} ${INSTALL_TARGET} - ${MKDIR} ${SCRIPTS_DIR} ${MOZ_PIS_DIR} - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${FAKEDIR}/bin/seamonkey \ - ${FAKEDIR}/bin/seamonkey-config - ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -139,62 +115,10 @@ pre-install: fi; \ done; \ fi - ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/seamonkey >> ${PLIST} - ${ECHO_CMD} lib/${MOZILLA}/seamonkey-config >> ${PLIST} -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${FILESDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor -.if !defined(WITHOUT_MAILNEWS) - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp ${FAKEDIR}/lib/${MOZILLA}/defaults -.endif ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:lib/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm lib/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/${MOZILLA} >> ${PLIST} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${ECHO_CMD} libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc >> ${PLIST} ; \ - done - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:include/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm include/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${MOZILLA} >> ${PLIST} - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} \ - && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${MOZILLA}/:' >> ${PLIST} \ - && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${MOZILLA}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${MOZILLA}" >> ${PLIST} - ${ECHO_CMD} "@unexec rmdir %D/share/idl 2>/dev/null || true" >> ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${MOZILLA} - ${CHMOD} 755 ${PREFIX}/lib/${MOZILLA} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/seamonkey ${PREFIX}/lib/${MOZILLA} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/seamonkey-config ${PREFIX}/lib/${MOZILLA} - cd ${FAKEDIR}/lib/${MOZILLA} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${MOZILLA} - for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${WRKSRC}/build/unix/$${pcfile}.pc; \ - ${INSTALL_DATA} ${WRKSRC}/build/unix/$${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/$${pcfile}${MOZ_SUFX}.pc ; \ - done - ${INSTALL_SCRIPT} ${WRKSRC}/${MOZILLA} ${PREFIX}/bin - if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \ - ${LN} -sf ${PREFIX}/bin/${MOZILLA} ${PREFIX}/bin/mozilla ; \ - fi - if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ - ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ - fi - ${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ for jpi in ${JPI_LIST}; do \ if [ -f $${jpi} ]; then \ @@ -204,18 +128,8 @@ do-install: fi; \ done; \ fi - -${RM} -fr ${PREFIX}/include/${MOZILLA} - ${MKDIR} ${PREFIX}/include/${MOZILLA} - ${CHMOD} 755 ${PREFIX}/include/${MOZILLA} - cd ${FAKEDIR}/include/${MOZILLA} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${MOZILLA} ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications - ${MKDIR} ${PREFIX}/share/idl/${MOZILLA} - cd ${FAKEDIR}/share/idl/${MOZILLA:S/-devel//}-${MOZ_VER} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${MOZILLA} - -post-install: - @-update-desktop-database +.include "${.CURDIR}/../mozilla/Makefile.common" .include <bsd.port.post.mk> diff --git a/www/seamonkey/files/mozconfig.in b/www/seamonkey/files/mozconfig.in deleted file mode 100644 index b6c50de65..000000000 --- a/www/seamonkey/files/mozconfig.in +++ /dev/null @@ -1,7 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -# $MCom: ports/www/firefox/files/mozconfig.in,v 1.9 2005/11/12 02:06:57 ahze Exp $ -###################################################################### -ac_add_options --enable-application=suite -ac_add_options --enable-svg-renderer=cairo -ac_add_options --enable-system-cairo diff --git a/www/seamonkey/files/patch-config_autoconf.mk.in b/www/seamonkey/files/patch-config_autoconf.mk.in index baf8588ee..c4fa0b516 100644 --- a/www/seamonkey/files/patch-config_autoconf.mk.in +++ b/www/seamonkey/files/patch-config_autoconf.mk.in @@ -5,7 +5,7 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/seamonkey%%HEADERS_SUFX%% ++includedir = @includedir@/%%MOZILLA%% libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ diff --git a/www/seamonkey/files/seamonkey.sh b/www/seamonkey/files/seamonkey.sh deleted file mode 100644 index e23b900e6..000000000 --- a/www/seamonkey/files/seamonkey.sh +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh - -MOZILLA_DIR="%%PREFIX%%/lib/%%MOZILLA%%" -MOZILLA_EXEC="./seamonkey" -MOZILLA_REMOTE_EXEC="${MOZILLA_EXEC} -remote" -APPLICATION_ID="mozilla" - -LOCATION='new-tab' -#MOZILLA_UILOCALE="en-US" -#MOZILLA_UIREGION="US" -#MOZILLA_DSP="auto" - -cd $MOZILLA_DIR || exit 1 - -# LANG, MOZILLA_UILOCALE, MOZILLA_UIREGION -if [ -n "$LANG" -a ! -n "${MOZILLA_UILOCALE}" ]; then - _locale="${LANG%%.*}" - if [ "${_locale}" != "en_US" -a "${_locale}" != "C" ]; then - _region="${_locale##*_}" - _locale="${_locale%_*}" - [ -r chrome/${_locale}-${_region}.jar ] && \ - MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${_locale}-${_region}" - fi -elif [ -n "${MOZILLA_UILOCALE}" ]; then - MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${MOZILLA_UILOCALE}" - if [ -n "${MOZILLA_UIREGION}" ]; then - MOZILLA_EXEC="${MOZILLA_EXEC} -UIRegion ${MOZILLA_UIREGION}" - fi -fi - -# find a /dev/dsp handler -case "${MOZILLA_DSP}" in -# [Ee][Ss][Dd]|esddsp) # Use the esd dsp wrapper -# MOZILLA_DSP="esddsp" -# ;; - [Aa][Rr][Tt][Ss]|artsdsp) # Use the arts dsp wrapper - MOZILLA_DSP="artsdsp" - ;; - [Nn][Oo][Nn][Ee]) # Direct dsp output - MOZILLA_DSP="" - ;; - *) # Guest one (auto) - if [ -n "${KDE_FULL_SESSION}" ]; then - MOZILLA_DSP="artsdsp" -# elif [ -r ${HOME}/.esd_auth ]; then -# MOZILLA_DSP="esddsp" - else - MOZILLA_DSP="" - fi - ;; -esac - -if [ -n "${MOZILLA_DSP}" ] && type "${MOZILLA_DSP}" > /dev/null 2>&1; then - MOZILLA_EXEC="${MOZILLA_DSP} ${MOZILLA_EXEC}" -fi - -case $1 in - -browser) - REMOTE_COMMAND="xfeDoCommand (openBrowser)" - ;; - -mail) - REMOTE_COMMAND="xfeDoCommand (openInbox)" - ;; - -compose) - REMOTE_COMMAND="xfeDoCommand (composeMessage)" - ;; - -*) - exec ${MOZILLA_EXEC} "$@" - ;; - *) - if [ -n "${LOCATION}" ]; then - REMOTE_COMMAND="openURL($@,$LOCATION)" - else - REMOTE_COMMAND="openURL($@)" - fi - ;; -esac - -# process found -${MOZILLA_REMOTE_EXEC} "ping()" >/dev/null 2>&1 && -${MOZILLA_REMOTE_EXEC} "${REMOTE_COMMAND}" && exit 0 - -# no existing process -exec ${MOZILLA_EXEC} "$@" - |