diff options
69 files changed, 1536 insertions, 766 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk new file mode 100644 index 000000000000..f9590eb51316 --- /dev/null +++ b/Mk/bsd.gecko.mk @@ -0,0 +1,653 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# Date created: 12 Nov 2005 +# Whom: Michael Johnson <ahze@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports-stable/Mk/bsd.gecko.mk,v 1.8 2008/06/20 22:17:41 mezz Exp $ +# +# 4 column tabs prevent hair loss and tooth decay! + +# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users +# and porters to support any available gecko backend without needing to build +# many conditional tests. ${USE_GECKO} is the list of backends that your port +# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. +# Users set ${WITH_GECKO} to the list of gecko backends they want on their +# system. + +.if defined(USE_GECKO) && ${USE_GECKO}!="gecko" + +.if !defined(Gecko_Pre_Include) +# Please make sure all changes to this file are passed through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +Gecko_Include_MAINTAINER= gnome@FreeBSD.org +Gecko_Pre_Include= bsd.gecko.mk + +# Users should use the following syntax: +# +# WITH_GECKO= mozilla firefox seamonkey +# Use mozilla whenever a port supports it, falling back on firefox and +# then seamonkey. +# WITH_GECKO= firefox +# Sets your preferred backend. With this example, firefox will always +# be chosen, unless the port doesn't support a firefox backend. In that +# case, you get whatever the porter chose as the default. Better to use +# the first example. +# +# +# Ports should use the following: +# +# USE_GECKO= mozilla firefox seamonkey +# The list of gecko backends that the port supports. Unless the user +# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO +# will be the default. In the above example, www/mozilla will be used +# as a gecko backend unless WITH_GECKO=firefox or WITH_GECKO=seamonkey +# is defined by the user. +# +# USE_GECKO= firefox-devel<->firefox +# This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure +# if ${GECKO}=="firefox-devel" +# +# Example: +# USE_GECKO= mozilla firefox seamonkey +# +# post-patch: +# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ +# ${WRKSRC}/configure +# +# If you want your port to check the ${GECKO} variable to see which backend +# has been chosen. +# +# Example: +# USE_GECKO= mozilla firefox seamonkey +# +# post-patch: +# .if ${GECKO}=="seamonkey" +# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ +# ${WRKSRC}/configure +# .endif + +.if ${OSVERSION} >= 500000 +.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" +_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock firefox3 +.endif +.endif +_GECKO_ALL+= mozilla + +thunderbird_PORTSDIR= mail + +.for gecko in ${_GECKO_ALL} +${gecko}_PORTSDIR?= www +${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} +${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so +.endfor + +# Figure out which mozilla to use +# Weed out bad options in USE_GECKO +.for badgecko in ${USE_GECKO} +. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" +GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} +. endif +. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" +${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g +. endif +.endfor + +.undef GECKO_FALLTHROUGH +.undef _FOUND_WITH_GECKO +# Figure out which gecko to use and weed out the bad ones +.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) +. for badgecko in ${WITH_GECKO} +. if ${GOOD_USE_GECKO:M${badgecko}}!="" +GOOD_WITH_GECKO+= ${badgecko} +. endif +. endfor +. if defined(GOOD_WITH_GECKO) +. for gecko in ${GOOD_WITH_GECKO} +. if !defined(GECKO_FALLTHROUGH) +GECKO= ${gecko} +GECKO_FALLTHROUGH= ${TRUE} +_FOUND_WITH_GECKO= ${TRUE} +. endif +. endfor +. endif +.endif + +.if !defined(GECKO) && defined(GOOD_USE_GECKO) +. for gecko in ${GOOD_USE_GECKO} +. if !defined(GECKO_FALLTRHOUGH) +GECKO= ${gecko} +GECKO_FALLTRHOUGH= ${TRUE} +. endif +. endfor +.endif + +# Generic defines +BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins +BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins + +GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config +XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl +XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` + +.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" +BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} +.else +IGNORE= Unable to find a supported gecko, please check USE_GECKO +.endif + +pre-everything:: _gecko-pre-everything + +_gecko-pre-everything:: + @${ECHO_CMD} "" +.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) + @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" + @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." + @${ECHO_CMD} " \"${GECKO}\" will be used" + @${ECHO_CMD} "" + @${ECHO_CMD} " for gecko support, but you can change that by using one of" + @${ECHO_CMD} " the following values:" +.else + @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" + @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" +.endif + @${ECHO_CMD} "" +.for gecko in ${GOOD_USE_GECKO} + @${ECHO_CMD} " ${gecko} " +.endfor + @${ECHO_CMD} "" + +post-patch: gecko-post-patch + +gecko-post-patch: +.if defined(${GECKO}_HACK) + ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ + ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} +.endif +.endif + +.else # split + +.if !defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) +Gecko_Pre_Include= bsd.gecko.mk + +# This file contains some reusable components for mozilla ports. It's of +# use primarily to apps from the mozilla project itself (such as Firefox, +# Thunderbird, etc.), and probably won't be of use for gecko-based ports +# like epiphany, galeon, etc. +# +# You need to make sure to add USE_GECKO=gecko to for your port can uses +# one of these options below. +# +# Ports can use the following: +# +# USE_MOZILLA By default, it enables the denendencies: cairo, dbm, +# jpeg, nspr, nss, png, xft and zip. Search for +# '_ALL_DEPENDS' below to see the list. If your port +# doesn't need one of list then you can use '-' like +# 'USE_MOZILLA= -png -zip' to subtract the dependencies. +# +# GECKO_PLIST_PRE_FILES Manual add files in the plist if it needs. +# +# GECKO_PLIST_PRE_DIRS Manual directories in the plist if it needs. +# +# MOZILLA_PLIST_DIRS List of directories to descend into when installing +# and creating the plist +# +# MOZ_PIS_SCRIPTS List of scripts residing in ${FILESDIR} to be +# filtered through MOZCONFIG_SED and installed along +# with our Pluggable Init Scripts (PIS) +# +# MOZ_SED_ARGS sed(1) commands through which MOZ_PIS_SCRIPTS are +# filtered. There is a default set defined here, so +# you probably want to add to MOZ_SED_ARGS rather +# than clobber it +# +# MOZ_OPTIONS configure arguments (added to .mozconfig). If +# NOMOZCONFIG is defined, you probably want to set +# CONFIGURE_ARGS+=${MOZ_OPTIONS} +# +# MOZ_MK_OPTIONS The make(1) arguments (added to .mozconfig). If +# NOMOZCONFIG is defined, you probably want to set +# MAKE_ARGS+=${MOZ_MK_OPTIONS} +# +# MOZ_EXPORT Environment variables for the build process (added +# to .mozconfig). If NOMOZCONFIG is defined, you +# probably want to set MAKE_ENV+=${MOZ_EXPORT} +# +# MOZ_TOOLKIT A variable for the --enable-default-toolkit= in +# CONFIGURE_ARGS. The default is gtk2. +# +# MOZ_EXTENSIONS A list of extensions to build +# +# MOZ_GRAPHICS A list of image decoders to build +# +# MOZ_PROTOCOLS A list of protocols to build (http, ftp, etc.) +# +# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can be +# set to a generic mozconfig included with the port +# +# NOGECKO_INSTALL Don't install the built gecko (most likely for +# testing) +# +# NOGECKO_PLIST Don't create a dynamically-generated playlist +# +# NOMOZCONFIG Don't drop a customized .mozconfig into the build +# directory. Options will have to be specified in +# CONFIGURE_ARGS instead +# + +MAINTAINER?= gnome@FreeBSD.org + +MOZILLA?= ${PORTNAME} +MOZILLA_VER?= ${PORTVERSION} +MOZILLA_BIN?= ${PORTNAME}-bin +MOZ_RPATH?= ${MOZILLA} +USE_GNOME+= gtk20 libidl desktopfileutils +USE_ICONV= yes +USE_PERL5_BUILD=yes +USE_XORG= printproto sm xt xi xext x11 xinerama \ + ice xproto + +MOZILLA_SUFX?= none +WRKSRC?= ${WRKDIR}/mozilla +FAKEDIR?= ${WRKDIR}/fake +PLIST?= ${WRKDIR}/plist +PLISTD?= ${WRKDIR}/plist_dirs +PLISTF?= ${WRKDIR}/plist_files +MASTER_DIR?= ${.CURDIR}/../../www/mozilla + +KRB5_HOME?= /usr +BROWSER_PLUGINS_DIR?= lib/browser_plugins +MOZ_PIS_DIR?= lib/${MOZILLA}/init.d + +ESD_LIB?= libesd.so.2 +FREETYPE_LIB?= libfreetype.so.9 + +GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in +PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in +MOZCONFIG?= ${WRKSRC}/.mozconfig +MOZILLA_PLIST_DIRS?= bin include lib share/idl +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} +PKGINSTALL?= ${WRKDIR}/pkg-install +PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall +MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla +PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in +PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in + +EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ + --exclude */macbuild/* \ + --exclude */package/* \ + --exclude mozilla/gc/boehm + +JPI_LIST?=\ + ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ + ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so + +MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ + ${MOZILLA}-xpcom ${MOZILLA}-plugin + +CFLAGS+= ${PTHREAD_CFLAGS} +LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv + +_USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags + +.if !defined(USE_GECKO_OPTIONS) +USE_GECKO_OPTIONS= debug logging optimized_cflags +.endif + +debug_OPTION= "Build a debugging image" off +java_OPTION= "Enable JAVA xpcom" off +logging_OPTION= "Enable additional log messages" off +optimized_cflags_OPTION= "Enable some additional optimizations" off + +.for option in ${USE_GECKO_OPTIONS:L} +.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!="" +OPTIONS+= ${option:U} ${${option}_OPTION} +_${option}= ${TRUE} +.endif +.endfor + +# Standard depends +_ALL_DEPENDS= cairo dbm jpeg nspr nss png xft zip + +cairo_LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo +cairo_MOZ_OPTIONS= --enable-system-cairo +cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo + +dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm + +jpeg_LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} +jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg + +nspr_LIB_DEPENDS= nspr4:${PORTSDIR}/devel/nspr +nspr_MOZ_OPTIONS= --with-system-nspr + +nss_LIB_DEPENDS= nss3:${PORTSDIR}/security/nss +nss_EXTRACT_AFTER_ARGS= --exclude mozilla/security/nss +nss_MOZ_OPTIONS= --with-system-nss +nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss +nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} + + +png_LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png +png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} + +xft_LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft +zip_DEPENDS= zip:${PORTSDIR}/archivers/zip + +.for use in ${USE_MOZILLA} +${use:S/-/_WITHOUT_/}= ${TRUE} +.endfor + +.for dep in ${_ALL_DEPENDS} +.if !defined(_WITHOUT_${dep}) +BUILD_DEPENDS+= ${${dep}_DEPENDS} +LIB_DEPENDS+= ${${dep}_LIB_DEPENDS} +RUN_DEPENDS+= ${${dep}_DEPENDS} +MOZ_OPTIONS+= ${${dep}_MOZ_OPTIONS} +EXTRACT_AFTER_ARGS+= ${${dep}_EXTRACT_AFTER_ARGS} +CPPFLAGS+= ${${dep}_CPPFLAGS} +LDFLAGS+= ${${dep}_LDFLAGS} +.endif +.endfor + +# Standard options from README +MOZ_TOOLKIT?= gtk2 +MOZ_OPTIONS+= --enable-crypto \ + --disable-tests \ + --enable-default-toolkit=${MOZ_TOOLKIT} \ + --enable-xft \ + --with-pthreads +# Configure options for install +MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib +.if !defined(MOZ_EXTENSIONS) +MOZ_OPTIONS+= --enable-extensions=default +.else +MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} +.endif +.if !defined(MOZ_GRAPHICS) +MOZ_OPTIONS+= --enable-image-decoders=default +.else +MOZ_OPTIONS+= --enable-image-decoders=${MOZ_GRAPHICS} +.endif +.if !defined(MOZ_PROTOCOLS) +MOZ_OPTIONS+= --enable-necko-protocols=default +.else +MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} +.endif +# others +MOZ_OPTIONS+= --with-system-zlib=/usr \ + --with-gssapi=${KRB5_HOME} \ + --disable-auto-deps \ + --enable-chrome-format=jar \ + --disable-cpp-exceptions \ + --disable-cpp-rtti \ + --disable-glibtest \ + --disable-gtktest \ + --disable-freetypetest \ + --enable-double-buffer \ + --enable-mathml \ + --disable-installer \ + --disable-md \ + --disable-pedantic \ + --disable-bidi \ + --disable-xterm-updates \ + --enable-xinerama +MOZ_MK_OPTIONS+= XP_UNIX=1 \ + PERL=${PERL} + +.if defined(WITH_OPTIMIZED_CFLAGS) +CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS} +WITH_OPTIMIZE?= -O2 +.else +CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS} +WITH_OPTIMIZE?= +.endif + +.if defined(WITH_SMB) +USE_GNOME+= gnomevfs2 +MOZ_OPTIONS+= --enable-gnomevfs +.else +MOZ_OPTIONS+= --disable-gnomevfs +.endif + +.if defined(WITH_DEBUG) +MOZ_OPTIONS+= --enable-debug \ + --disable-strip +WITH_LOGGING= yes +.else +MOZ_OPTIONS+= --disable-debug \ + --enable-optimize=${WITH_OPTIMIZE} \ + --enable-strip +.endif + +.if defined(WITH_JAVA) && defined(_WITH_JAVA) +USE_JAVA= yes +JAVA_VERSION+= 1.4+ +JAVA_OS+= native +CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" +MOZ_OPTIONS+= --enable-javaxpcom +.endif + +.if defined(WITH_LOGGING) +MOZ_OPTIONS+= --enable-logging +.else +MOZ_OPTIONS+= --disable-logging +.endif + +MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ + -e 's|@CFLAGS@|${CFLAGS}|g' \ + -e 's|@LDFLAGS@|${LDFLAGS}|g' \ + -e 's|@LIBS@|${LIBS}|g' \ + -e 's|@LOCALBASE@|${LOCALBASE}|g' \ + -e 's|@FAKEDIR@|${FAKEDIR}|g' \ + -e 's|@PERL@|${PERL5}|g' \ + -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ + -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ + -e 's|%%PREFIX%%|${PREFIX}|g' \ + -e 's|%%CFLAGS%%|${CFLAGS}|g' \ + -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ + -e 's|%%LIBS%%|${LIBS}|g' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ + -e 's|%%PERL%%|${PERL5}|g' \ + -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ + -e 's|%%MOZILLA%%|${MOZILLA}|g' \ + -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ + -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' +MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} + +.else # bsd.port.post.mk + +post-patch: gecko-post-patch gecko-moz-pis-patch + +gecko-post-patch: +.if exists(${PKGINSTALL_INC}) + @${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL} +.endif +.if exists(${PKGDEINSTALL_INC}) + @${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL} +.endif + @${RM} -f ${MOZCONFIG} +.if !defined(NOMOZCONFIG) +.if exists(${GENERIC_MOZCONFIG}) + @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG} +.endif + @if [ -e ${PORT_MOZCONFIG} ] ; then \ + ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ + fi +.for arg in ${MOZ_OPTIONS} + @${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG} +.endfor +.for arg in ${MOZ_MK_OPTIONS} + @${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG} +.endfor +.for var in ${MOZ_EXPORT} + @${ECHO_CMD} "export ${var}" >> ${MOZCONFIG} +.endfor +.endif # .if !defined(NOMOZCONFIG) + @${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 + @${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|%%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 + @if [ -d ${WRKSRC}/directory/c-sdk ]; then \ + ${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ + ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ + ${WRKSRC}/directory/c-sdk/configure ; \ + fi + @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${WRKSRC}/build/unix/run-mozilla.sh + @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ + ${WRKSRC}/widget/src/gtk2/nsSound.cpp + @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ + ${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp + @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ + s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ + ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp + @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ + ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ + ${FALSE}; \ + fi + +# handles mozilla pis scripts. +gecko-moz-pis-patch: +.for moz in ${MOZ_PIS_SCRIPTS} + @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} +.endfor + +post-configure: gecko-post-configure + +gecko-post-configure: + @${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/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} + +pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist + +.if !target(port-pre-install) +port-pre-install: + @${DO_NADA} +.endif + +gecko-pre-install: +.if !defined(NOGECKO_PLIST) + @${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF} + @${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF} + @cd ${WRKSRC} && ${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} +.if exists(${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config) + ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config +.endif +.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||} + ${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \ + ${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc +.endfor + @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ + s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ + ${FAKEDIR}/bin/${MOZILLA}* +.endif + @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ + ${FAKEDIR}/bin/${MOZILLA}* + ${RM} -f ${FAKEDIR}/bin/*.bak +.endif + +gecko-create-plist: +.if !defined(NOGECKO_PLIST) +# Create the plist +.for f in ${GECKO_PLIST_PRE_FILES} + ${ECHO_CMD} ${f} >> ${PLISTF} +.endfor +.for f in ${GECKO_PLIST_PRE_DIRS} + ${ECHO_CMD} "@dirrm ${f}" >> ${PLISTD} +.endfor + ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLISTF} + ${ECHO_CMD} "@dirrmtry ${BROWSER_PLUGINS_DIR}" >> ${PLISTD} + ${MKDIR} ${FAKEDIR}/libdata + ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ || ${TRUE} + ${RM} -f ${FAKEDIR}/lib/pkgconfig +.for dir in ${MOZILLA_PLIST_DIRS} + @cd ${FAKEDIR}/${dir} && ${FIND} -H -s * -type f | \ + ${SED} -e 's|^|${dir}/|' >> ${PLISTF} && \ + ${FIND} -d * -type d | \ + ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLISTD} +.endfor +.for pcfile in ${MOZ_PKGCONFIG_FILES} + ${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLISTF} + @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ + -e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \ + ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc +.endfor + ${CAT} ${PLISTF} | ${SORT} >> ${PLIST} + ${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST} + ${ECHO_CMD} "@dirrmtry share/idl" >> ${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} +.endif # !defined(NOGECKO_PLIST) + +do-install: gecko-do-install + +gecko-do-install: +.if !defined(NOGECKO_INSTALL) +.for dir in ${MOZILLA_PLIST_DIRS} +.if !exists(${PREFIX}/${dir}) + ${MKDIR} ${PREFIX}/${dir} + ${CHMOD} 755 ${PREFIX}/${dir} +.endif + cd ${FAKEDIR}/${dir} && ${FIND} . | \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir} +.endfor +.for pcfile in ${MOZ_PKGCONFIG_FILES} + ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ + ${PREFIX}/libdata/pkgconfig/${pcfile}.pc +.endfor + ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} + ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep +.endif # !defined(NOGECKO_INSTALL) + +gecko-moz-pis-pre-install: +.if defined(MOZ_PIS_SCRIPTS) + ${MKDIR} ${FAKEDIR}/${MOZ_PIS_DIR} +.for moz in ${MOZ_PIS_SCRIPTS} + ${INSTALL_SCRIPT} ${WRKDIR}/${moz} ${FAKEDIR}/${MOZ_PIS_DIR} +.endfor +.endif + +post-install: gecko-post-install + +gecko-post-install: +.if !defined(PACKAGE_BUILDING) && !defined(NO_MOZPKGINSTALL) + @if [ -e ${PKGINSTALL} ] ; then \ + ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \ + fi +.endif + @-update-desktop-database + +.endif +.endif +# HERE THERE BE TACOS -- adamw diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 20cb47a9ad13..57f5a3d49a10 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -3,7 +3,7 @@ # # $FreeBSD$ # $NetBSD: $ -# $MCom: ports/Mk/bsd.gnome.mk,v 1.447 2008/03/12 03:42:31 marcus Exp $ +# $MCom: ports-stable/Mk/bsd.gnome.mk,v 1.8 2008/06/16 21:35:56 mezz Exp $ # # Please view me with 4 column tabs! @@ -645,7 +645,7 @@ ${component}_USE_GNOME_IMPL+=${${subcomponent}_USE_GNOME_IMPL} # Also, check to see if each component has a desktop requirement. If it does, # and if the user's chosen desktop is not of the same version, mark the # port as IGNORE. -. for component in ${USE_GNOME} +. for component in ${USE_GNOME:C/^([^:]+).*/\1/} . if defined(GNOME_DESKTOP_VERSION) && \ defined(${component}_GNOME_DESKTOP_VERSION) . if ${GNOME_DESKTOP_VERSION}!=${${component}_GNOME_DESKTOP_VERSION} @@ -677,16 +677,21 @@ lthacks_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ ${PATCH_WRKSRC}/$$file; \ done; .else -. if ${USE_GNOME:Mltverhack}!="" || ${USE_GNOME:Mltasneededhack}!="" +. if ${USE_GNOME:Mltverhack*}!="" || ${USE_GNOME:Mltasneededhack}!="" IGNORE= cannot install: ${PORTNAME} uses the ltverhack and/or ltasneededhack GNOME components but does not use libtool . endif .endif +.if ${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}=="" +ltverhack_LIB_VERSION= major=.`expr $$current - $$age` +.else +ltverhack_LIB_VERSION= major=".${USE_GNOME:Mltverhack\:*:C/^[^:]+:([^:]+).*/\1/}" +.endif ltverhack_PATCH_DEPENDS=${LIBTOOL_DEPENDS} ltverhack_PRE_PATCH= for file in gnome-ltmain.sh gnome-libtool; do \ if [ -f ${WRKDIR}/$$file ]; then \ ${REINPLACE_CMD} -e \ - '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \ + '/freebsd-elf)/,/;;/ s|major="\.$$current"|${ltverhack_LIB_VERSION}|; \ /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \ ${WRKDIR}/$$file; \ fi; \ @@ -703,9 +708,9 @@ ltasneededhack_PRE_PATCH= if [ -f ${WRKDIR}/gnome-libtool ]; then \ # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly .ifdef _USE_GNOME -. if ${USE_GNOME:Mltverhack}!= "" || ${USE_GNOME:Mltasneededhack}!= "" +. if ${USE_GNOME:Mltverhack*}!= "" || ${USE_GNOME:Mltasneededhack}!= "" GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} -.endif +. endif . for component in ${_USE_GNOME_ALL} . if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 9a88b2db1010..e36454bb6e24 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -444,6 +444,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # (Also see that file for more information on # USE_GNUSTEP_*). ## +# USE_GECKO - If set, this port uses the Gecko/Mozilla product. +# See bsd.gecko.mk for more details. +## # USE_GNOME - A list of the Gnome dependencies the port has (e.g., # glib12, gtk12). Implies that the port needs Gnome. # Implies inclusion of bsd.gnome.mk. See bsd.gnome.mk @@ -1497,6 +1500,10 @@ PERL= ${LOCALBASE}/bin/perl .include "${PORTSDIR}/Mk/bsd.qt.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif @@ -2006,6 +2013,10 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} \ .include "${PORTSDIR}/Mk/bsd.autotools.mk" .endif +.if defined(WANT_GECKO) || defined(USE_GECKO) +.include "${PORTSDIR}/Mk/bsd.gecko.mk" +.endif + .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) .include "${PORTSDIR}/Mk/bsd.gnome.mk" .endif diff --git a/converters/pdf2djvu/Makefile b/converters/pdf2djvu/Makefile index c144f175de8a..306389cc81fc 100644 --- a/converters/pdf2djvu/Makefile +++ b/converters/pdf2djvu/Makefile @@ -7,6 +7,7 @@ PORTNAME= pdf2djvu PORTVERSION= 0.4.10 +PORTREVISION= 1 CATEGORIES= converters MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}_${PORTVERSION}${EXTRACT_SUFFIX} @@ -15,7 +16,7 @@ MAINTAINER= darcsis@gmail.com COMMENT= Pdf2djvu creates DjVu files from PDF files BUILD_DEPENDS= ${LOCALBASE}/include/pstreams/pstream.h:${PORTSDIR}/devel/pstreams -LIB_DEPENDS= poppler.2:${PORTSDIR}/graphics/poppler +LIB_DEPENDS= poppler.3:${PORTSDIR}/graphics/poppler USE_GMAKE= yes PLIST_FILES= bin/pdf2djvu diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 5b17f3d662f3..7a9eeb3730ad 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairo/Makefile,v 1.69 2008/03/21 04:04:14 ahze Exp $ +# $MCom: ports-stable/graphics/cairo/Makefile,v 1.3 2008/06/16 21:35:57 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.4.14 -PORTREVISION?= 0 +PORTVERSION= 1.6.4 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ @@ -31,7 +31,7 @@ USE_GNOME= gnometarget gnomehack ltverhack referencehack USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes -CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ LDFLAGS="${PTHREAD_LIBS}" .if defined(WITHOUT_X11) diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 803d2eb62758..afffbc8d7480 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-1.4.14.tar.gz) = e8c442ff821c0719a69508fecba9038f -SHA256 (cairo-1.4.14.tar.gz) = 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c -SIZE (cairo-1.4.14.tar.gz) = 3283608 +MD5 (cairo-1.6.4.tar.gz) = a198d509f9e3a35b78de8bb02174ebb9 +SHA256 (cairo-1.6.4.tar.gz) = 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42 +SIZE (cairo-1.6.4.tar.gz) = 5042623 diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile index da41c82e362b..cfc2a9b2db4e 100644 --- a/graphics/cairomm/Makefile +++ b/graphics/cairomm/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/cairomm/Makefile,v 1.7 2008/03/21 21:48:49 kwm Exp $ +# $MCom: ports-stable/graphics/cairomm/Makefile,v 1.4 2008/06/16 22:38:50 mezz Exp $ # PORTNAME= cairomm -PORTVERSION= 1.4.8 -PORTREVISION= 4 +PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo index 1d91365fa1b5..f970b8d202fb 100644 --- a/graphics/cairomm/distinfo +++ b/graphics/cairomm/distinfo @@ -1,3 +1,3 @@ -MD5 (cairomm-1.4.8.tar.gz) = 2b2025b3555fa1665d92cf9f9be1a4d3 -SHA256 (cairomm-1.4.8.tar.gz) = 795a1c1f5aab72752cbce8d2c0502279ac999351726a5369bec737af0c834e92 -SIZE (cairomm-1.4.8.tar.gz) = 786851 +MD5 (cairomm-1.6.0.tar.gz) = 549b0c9eaa25d61c4dd92d2de1cb4a46 +SHA256 (cairomm-1.6.0.tar.gz) = 8e027d1fb6f0e9fb9f8c871a16a85d19a8c95a069a97ea498422fdd675dda737 +SIZE (cairomm-1.6.0.tar.gz) = 797627 diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist index ccd1a880052b..af5a631e8cb1 100644 --- a/graphics/cairomm/pkg-plist +++ b/graphics/cairomm/pkg-plist @@ -122,6 +122,7 @@ libdata/pkgconfig/cairomm-1.0.pc %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/classstd_1_1logic__error__inherit__graph.png %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h-source.html %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/context_8h.html +%%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/deprecated.html %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_60681489e9d398c429ccaa1240ca56f5.html %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_60681489e9d398c429ccaa1240ca56f5_dep.map %%PORTDOCS%%share/doc/libcairomm-1.0/reference/html/dir_60681489e9d398c429ccaa1240ca56f5_dep.png diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile index a87b89a70938..adf795ff4c4f 100644 --- a/graphics/epdfview/Makefile +++ b/graphics/epdfview/Makefile @@ -7,7 +7,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics print gnome MASTER_SITES= http://trac.emma-soft.com/epdfview/chrome/site/releases/ \ LOCAL/chinsan @@ -16,7 +16,7 @@ MAINTAINER= chinsan@FreeBSD.org COMMENT= A lightweight PDF document viewer BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit -LIB_DEPENDS= poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile index 20f51579f949..2130bdca47ef 100644 --- a/graphics/evince/Makefile +++ b/graphics/evince/Makefile @@ -3,12 +3,12 @@ # Whom: Adam Weinberger <adamw@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/evince/Makefile,v 1.97 2008/03/15 20:08:24 ahze Exp $ +# $MCom: ports-stable/graphics/evince/Makefile,v 1.5 2008/06/17 03:47:54 mezz Exp $ # PORTNAME= evince PORTVERSION= 2.22.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics print gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 2 multi-format document viewer -LIB_DEPENDS= poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \ +LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \ spectre.1:${PORTSDIR}/print/libspectre USE_LDCONFIG= yes diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index eaa3b9f78a1e..1218aa08cf36 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,12 +3,12 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports-stable/graphics/gimp-app/Makefile,v 1.1 2007/12/02 18:43:48 ahze Exp $ +# $MCom: ports-stable/graphics/gimp-app/Makefile,v 1.4 2008/06/17 03:24:09 mezz Exp $ # PORTNAME= gimp-app DISTVERSION= 2.4.6 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -26,7 +26,7 @@ COMMENT= A GNU Image Manipulation Program LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ wmf.2:${PORTSDIR}/graphics/libwmf \ - poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \ + poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \ aa.1:${PORTSDIR}/graphics/aalib \ mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 69ab70f276b5..a82dc333b631 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -7,7 +7,7 @@ PORTNAME= inkscape PORTVERSION= 0.46 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= SF @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-gnome-vfs .endif .if defined(WITH_POPPLER) -LIB_DEPENDS+= poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk +LIB_DEPENDS+= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk CONFIGURE_ARGS+= --enable-poppler-cairo .else CONFIGURE_ARGS+= --disable-poppler-cairo diff --git a/graphics/poppler-gtk/Makefile b/graphics/poppler-gtk/Makefile index b4a034c91625..cee8d80ee141 100644 --- a/graphics/poppler-gtk/Makefile +++ b/graphics/poppler-gtk/Makefile @@ -3,7 +3,7 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-gtk/Makefile,v 1.3 2006/03/09 01:49:50 marcus Exp $ +# $MCom: ports-stable/graphics/poppler-gtk/Makefile,v 1.1 2008/06/16 21:36:00 mezz Exp $ PORTREVISION= 1 PKGNAMESUFFIX= -gtk diff --git a/graphics/poppler-gtk/pkg-plist b/graphics/poppler-gtk/pkg-plist index a65344cde4fa..2ca48e539647 100644 --- a/graphics/poppler-gtk/pkg-plist +++ b/graphics/poppler-gtk/pkg-plist @@ -1,4 +1,5 @@ include/poppler/glib/poppler-action.h +include/poppler/glib/poppler-annot.h include/poppler/glib/poppler-attachment.h include/poppler/glib/poppler-document.h include/poppler/glib/poppler-enums.h @@ -9,7 +10,7 @@ include/poppler/glib/poppler.h lib/libpoppler-glib.a lib/libpoppler-glib.la lib/libpoppler-glib.so -lib/libpoppler-glib.so.2 +lib/libpoppler-glib.so.3 libdata/pkgconfig/poppler-glib.pc %%DOCSDIR%%/poppler/ch01.html %%DOCSDIR%%/poppler/home.png diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile index 0635fac9be16..7303eae985fd 100644 --- a/graphics/poppler-qt4/Makefile +++ b/graphics/poppler-qt4/Makefile @@ -3,7 +3,8 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/poppler-qt4/Makefile,v 1.1 2007/06/26 16:08:30 ahze Exp $ +# $MCom: ports-stable/graphics/poppler-qt4/Makefile,v 1.3 2008/06/20 17:48:14 mezz Exp $ +# PORTREVISION= 1 PKGNAMESUFFIX= -qt4 diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist index e3723c05f403..d49be20711e6 100644 --- a/graphics/poppler-qt4/pkg-plist +++ b/graphics/poppler-qt4/pkg-plist @@ -1,11 +1,13 @@ include/poppler/qt4/poppler-annotation.h +include/poppler/qt4/poppler-export.h include/poppler/qt4/poppler-form.h include/poppler/qt4/poppler-link.h +include/poppler/qt4/poppler-optcontent.h include/poppler/qt4/poppler-page-transition.h include/poppler/qt4/poppler-qt4.h lib/libpoppler-qt4.a lib/libpoppler-qt4.la lib/libpoppler-qt4.so -lib/libpoppler-qt4.so.2 +lib/libpoppler-qt4.so.3 libdata/pkgconfig/poppler-qt4.pc @dirrm include/poppler/qt4 diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 549a75b900c1..9c52b661fae9 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -3,11 +3,11 @@ # Whom: marcus@FreeBSD.org # # $FreeBSD$ -# $MCom: ports-stable/graphics/poppler/Makefile,v 1.4 2007/11/30 04:35:05 marcus Exp $ +# $MCom: ports-stable/graphics/poppler/Makefile,v 1.8 2008/06/20 17:47:36 mezz Exp $ # PORTNAME= poppler -PORTVERSION= 0.6.4 +PORTVERSION= 0.8.3 PORTREVISION?= 1 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -19,8 +19,8 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_GNOME= gnomehack gnometarget libxml2 +USE_GNOME= gnomehack gnometarget libxml2 ltverhack +USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes CONFIGURE_ARGS= --enable-zlib \ --enable-xpdf-headers \ @@ -35,7 +35,7 @@ OPTIONS= CAIRO "Enable cairo output backend" on .include <bsd.port.pre.mk> .if defined(SLAVEPORT) -LIB_DEPENDS+= poppler.2:${PORTSDIR}/graphics/poppler +LIB_DEPENDS+= poppler.3:${PORTSDIR}/graphics/poppler .if ${SLAVEPORT}=="gtk" CONFIGURE_ARGS+=--enable-poppler-glib USE_GNOME+= gtk20 @@ -58,7 +58,10 @@ CONFIGURE_ARGS+=--disable-poppler-qt .if ${SLAVEPORT}=="qt4" CONFIGURE_ARGS+=--enable-poppler-qt4 USE_QT_VER+= 4 -QT_COMPONENTS= gui corelib xml qtestlib +QT_COMPONENTS= gui corelib xml qtestlib moc_build +# It requires poppler/splash to be built unless you disable splash backend +# support to allow you use BUILD_WRKSRC here. It seems that splash backend +# can read more PDF files than without, tested with demos's poppler_qt4viewer. #BUILD_WRKSRC= ${WRKSRC}/qt4 INSTALL_WRKSRC= ${WRKSRC}/qt4 .else diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index a8758856c9da..4229799e1f0c 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -MD5 (poppler-0.6.4.tar.gz) = 13d12ca4e349574cfbbcf4a9b2b3ae52 -SHA256 (poppler-0.6.4.tar.gz) = 54269075e4d611a61792a374986e920744c8ca39c2df45911233873c7e714354 -SIZE (poppler-0.6.4.tar.gz) = 1294481 +MD5 (poppler-0.8.3.tar.gz) = d5631bdbde9dda89ff20796005ece4d4 +SHA256 (poppler-0.8.3.tar.gz) = 4d7334a64de975c1453744f2b91a549b25cf35c2d3e66fa2b969c91fc1c4b535 +SIZE (poppler-0.8.3.tar.gz) = 1463306 diff --git a/graphics/poppler/files/patch-Makefile.in b/graphics/poppler/files/patch-Makefile.in deleted file mode 100644 index 02c8919d0713..000000000000 --- a/graphics/poppler/files/patch-Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.in.orig Thu Sep 21 20:54:29 2006 -+++ Makefile.in Sat Sep 30 10:51:57 2006 -@@ -76,7 +76,7 @@ - DATA = $(pkgconfig_DATA) - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = goo fofi splash poppler utils glib qt test qt4 -+DIST_SUBDIRS = goo fofi splash poppler utils glib qt - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -254,10 +254,10 @@ - @BUILD_POPPLER_GLIB_TRUE@glib_pc_file = poppler-glib.pc - @BUILD_POPPLER_QT_TRUE@qt_subdir = qt - @BUILD_POPPLER_QT_TRUE@qt_pc_file = poppler-qt.pc --@BUILD_POPPLER_QT4_TRUE@qt4_subdir = qt4 -+@BUILD_POPPLER_QT4_TRUE@qt4_subdir = - @BUILD_POPPLER_QT4_TRUE@qt4_pc_file = poppler-qt4.pc - @BUILD_UTILS_TRUE@utils_subdir = utils --SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) -+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) - EXTRA_DIST = \ - README-XPDF \ - poppler.pc.in \ diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in index 1df868bc4b3c..94d7703cd62b 100644 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ b/graphics/poppler/files/patch-glib_Makefile.in @@ -1,23 +1,22 @@ ---- glib/Makefile.in.orig 2007-09-10 23:46:36.000000000 -0400 -+++ glib/Makefile.in 2007-09-10 23:49:39.000000000 -0400 -@@ -66,7 +66,6 @@ am__DEPENDENCIES_1 = +--- glib/Makefile.in.orig 2008-03-24 09:03:54.000000000 -0400 ++++ glib/Makefile.in 2008-03-24 09:04:38.000000000 -0400 +@@ -66,7 +66,6 @@ @BUILD_CAIRO_OUTPUT_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/poppler/libpoppler-cairo.la \ @BUILD_CAIRO_OUTPUT_TRUE@ $(am__DEPENDENCIES_1) libpoppler_glib_la_DEPENDENCIES = \ - $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am__objects_1 = poppler-enums.lo -@@ -78,7 +77,7 @@ PROGRAMS = $(noinst_PROGRAMS) - am_test_poppler_glib_OBJECTS = test-poppler-glib.$(OBJEXT) +@@ -80,7 +79,6 @@ + @BUILD_WITH_GDK_TRUE@ test-poppler-glib.$(OBJEXT) test_poppler_glib_OBJECTS = $(am_test_poppler_glib_OBJECTS) - test_poppler_glib_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la libpoppler-glib.la \ -+ libpoppler-glib.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler -@@ -285,7 +284,7 @@ win32_libs = @win32_libs@ + @BUILD_WITH_GDK_TRUE@test_poppler_glib_DEPENDENCIES = \ +-@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ + @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la $(am__DEPENDENCIES_1) \ + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_WITH_GDK_TRUE@ $(am__DEPENDENCIES_1) \ +@@ -295,7 +293,7 @@ @BUILD_CAIRO_OUTPUT_TRUE@ $(top_builddir)/poppler/libpoppler-cairo.la \ @BUILD_CAIRO_OUTPUT_TRUE@ $(CAIRO_LIBS) @@ -26,21 +25,21 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"Poppler\" \ -I$(top_srcdir) \ -@@ -323,7 +322,7 @@ libpoppler_glib_la_SOURCES = \ +@@ -336,7 +334,7 @@ poppler-private.h libpoppler_glib_la_LIBADD = \ - $(top_builddir)/poppler/libpoppler.la \ + -lpoppler \ $(POPPLER_GLIB_LIBS) \ + $(GDK_LIBS) \ $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) \ -@@ -334,7 +333,7 @@ test_poppler_glib_SOURCES = \ - test-poppler-glib.c +@@ -348,7 +346,7 @@ + @BUILD_WITH_GDK_TRUE@ test-poppler-glib.cc - test_poppler_glib_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ + @BUILD_WITH_GDK_TRUE@test_poppler_glib_LDADD = \ +-@BUILD_WITH_GDK_TRUE@ $(top_builddir)/poppler/libpoppler.la \ ++@BUILD_WITH_GDK_TRUE@ -lpoppler \ + @BUILD_WITH_GDK_TRUE@ libpoppler-glib.la \ + @BUILD_WITH_GDK_TRUE@ $(POPPLER_GLIB_LIBS) \ + @BUILD_WITH_GDK_TRUE@ $(GDK_LIBS) \ diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in index d23d6319a3f0..ffb4777b4074 100644 --- a/graphics/poppler/files/patch-qt4_Makefile.in +++ b/graphics/poppler/files/patch-qt4_Makefile.in @@ -1,10 +1,10 @@ ---- qt4/Makefile.in.orig 2007-08-27 20:43:27.000000000 -0400 -+++ qt4/Makefile.in 2007-08-27 20:43:46.000000000 -0400 -@@ -223,7 +223,7 @@ sharedstatedir = @sharedstatedir@ +--- qt4/Makefile.in.orig 2008-03-24 08:30:49.000000000 -0400 ++++ qt4/Makefile.in 2008-03-24 08:30:34.000000000 -0400 +@@ -223,7 +223,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ win32_libs = @win32_libs@ --SUBDIRS = src tests +-SUBDIRS = src tests demos +SUBDIRS = src all: all-recursive diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in new file mode 100644 index 000000000000..b63f278d1b8b --- /dev/null +++ b/graphics/poppler/files/patch-qt4_src_Makefile.in @@ -0,0 +1,28 @@ +--- qt4/src/Makefile.in.orig 2008-06-20 11:27:32.000000000 -0500 ++++ qt4/src/Makefile.in 2008-06-20 11:29:36.000000000 -0500 +@@ -62,7 +62,6 @@ + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + libpoppler_qt4_la_DEPENDENCIES = \ +- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__append_1) + am_libpoppler_qt4_la_OBJECTS = poppler-document.lo poppler-page.lo \ + poppler-fontinfo.lo poppler-embeddedfile.lo poppler-textbox.lo \ +@@ -302,7 +301,7 @@ + poppler-export.h \ + poppler-private.h + +-libpoppler_qt4_la_LIBADD = $(top_builddir)/poppler/libpoppler.la \ ++libpoppler_qt4_la_LIBADD = -lpoppler \ + $(FONTCONFIG_LIBS) $(POPPLER_QT4_LIBS) $(am__append_1) + libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0 + all: all-am +@@ -620,7 +619,7 @@ + + # This rule lets GNU make create any *.moc from the equivalent *.h + .h.moc: +- moc -i $< -o $@ ++ moc-qt4 -i $< -o $@ + + poppler-optcontent.lo: poppler-optcontent.moc + diff --git a/graphics/poppler/files/patch-qt_Makefile.in b/graphics/poppler/files/patch-qt_Makefile.in index 4ad2d0c3da9d..d872262ea020 100644 --- a/graphics/poppler/files/patch-qt_Makefile.in +++ b/graphics/poppler/files/patch-qt_Makefile.in @@ -1,6 +1,6 @@ ---- qt/Makefile.in.orig Wed Jun 20 07:19:52 2007 -+++ qt/Makefile.in Wed Jun 20 07:30:01 2007 -@@ -63,8 +63,7 @@ +--- qt/Makefile.in.orig 2008-03-27 08:17:35.000000000 -0400 ++++ qt/Makefile.in 2008-03-27 08:18:20.000000000 -0400 +@@ -59,8 +59,7 @@ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -10,17 +10,16 @@ $(am__DEPENDENCIES_1) am_libpoppler_qt_la_OBJECTS = poppler-document.lo poppler-fontinfo.lo \ poppler-link.lo poppler-page.lo poppler-page-transition.lo -@@ -72,8 +71,7 @@ +@@ -71,7 +70,7 @@ PROGRAMS = $(noinst_PROGRAMS) am_test_poppler_qt_OBJECTS = test-poppler-qt.$(OBJEXT) test_poppler_qt_OBJECTS = $(am_test_poppler_qt_OBJECTS) -test_poppler_qt_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -+test_poppler_qt_DEPENDENCIES = libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler ++test_poppler_qt_DEPENDENCIES = \ + libpoppler-qt.la $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -286,7 +284,7 @@ +@@ -273,7 +272,7 @@ poppler-private.h libpoppler_qt_la_LIBADD = \ @@ -29,7 +28,7 @@ $(POPPLER_QT_LIBS) \ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) -@@ -296,7 +294,7 @@ +@@ -283,7 +282,7 @@ test-poppler-qt.cpp test_poppler_qt_LDADD = \ diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in index ffc289c45ab2..72154021da8d 100644 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ b/graphics/poppler/files/patch-utils_Makefile.in @@ -1,64 +1,63 @@ ---- utils/Makefile.in.orig Wed Jun 20 07:19:52 2007 -+++ utils/Makefile.in Wed Jun 20 07:29:29 2007 -@@ -62,49 +62,41 @@ +--- utils/Makefile.in.orig 2008-03-27 08:18:44.000000000 -0400 ++++ utils/Makefile.in 2008-03-27 08:19:51.000000000 -0400 +@@ -58,48 +58,48 @@ pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) pdffonts_LDADD = $(LDADD) am__DEPENDENCIES_1 = -pdffonts_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdffonts_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdffonts_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ $(am__objects_1) pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) pdfimages_LDADD = $(LDADD) -pdfimages_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdfimages_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdfimages_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) $(am__objects_1) pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) pdfinfo_LDADD = $(LDADD) -pdfinfo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdfinfo_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdfinfo_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am__pdftoabw_SOURCES_DIST = pdftoabw.cc parseargs.c parseargs.h @BUILD_ABIWORD_OUTPUT_TRUE@am_pdftoabw_OBJECTS = pdftoabw.$(OBJEXT) \ @BUILD_ABIWORD_OUTPUT_TRUE@ $(am__objects_1) pdftoabw_OBJECTS = $(am_pdftoabw_OBJECTS) pdftoabw_LDADD = $(LDADD) -pdftoabw_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdftoabw_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdftoabw_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am_pdftohtml_OBJECTS = pdftohtml.$(OBJEXT) HtmlFonts.$(OBJEXT) \ HtmlLinks.$(OBJEXT) HtmlOutputDev.$(OBJEXT) $(am__objects_1) pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) pdftohtml_LDADD = $(LDADD) -pdftohtml_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdftohtml_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdftohtml_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am__pdftoppm_SOURCES_DIST = pdftoppm.cc parseargs.c parseargs.h @BUILD_SPLASH_OUTPUT_TRUE@am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) \ @BUILD_SPLASH_OUTPUT_TRUE@ $(am__objects_1) pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) pdftoppm_LDADD = $(LDADD) -pdftoppm_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdftoppm_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdftoppm_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am_pdftops_OBJECTS = pdftops.$(OBJEXT) $(am__objects_1) pdftops_OBJECTS = $(am_pdftops_OBJECTS) pdftops_LDADD = $(LDADD) -pdftops_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdftops_DEPENDENCIES = $(am__DEPENDENCIES_1) ++pdftops_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) $(am__objects_1) pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) pdftotext_LDADD = $(LDADD) -pdftotext_DEPENDENCIES = $(top_builddir)/poppler/libpoppler.la \ -- $(am__DEPENDENCIES_1) -+pdftotext_DEPENDENCIES = $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler ++pdftotext_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/poppler depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -318,7 +310,7 @@ +@@ -302,7 +302,7 @@ $(ABIWORD_CFLAGS) LDADD = \ diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index e9107d64c59f..fc990dc74e70 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -26,9 +26,11 @@ include/poppler/JBIG2Stream.h include/poppler/JPXStream.h include/poppler/Lexer.h include/poppler/Link.h +include/poppler/Movie.h include/poppler/NameToCharCode.h include/poppler/NameToUnicodeTable.h include/poppler/Object.h +include/poppler/OptionalContent.h include/poppler/Outline.h include/poppler/OutputDev.h include/poppler/PDFDoc.h @@ -92,7 +94,7 @@ include/poppler/splash/SplashXPathScanner.h lib/libpoppler.a lib/libpoppler.la lib/libpoppler.so -lib/libpoppler.so.2 +lib/libpoppler.so.3 libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc diff --git a/graphics/popplerkit/Makefile b/graphics/popplerkit/Makefile index 087ce59a950c..b0f71308e721 100644 --- a/graphics/popplerkit/Makefile +++ b/graphics/popplerkit/Makefile @@ -7,7 +7,7 @@ PORTNAME= popplerkit PORTVERSION= 0.0.${SNAPSHOT} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnustep MASTER_SITES= http://download.gna.org/gsimageapps/PopplerKit/ DISTNAME= PopplerKit-${SNAPSHOT} diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 45a203f1f19e..a2538f6c2485 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -6,8 +6,7 @@ # PORTNAME= poppler -PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTVERSION= 0.8.1 CATEGORIES= graphics MASTER_SITES= http://www.gnome.org/~gianmt/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,14 +15,11 @@ DISTNAME= py${PORTNAME}-${PORTVERSION} MAINTAINER= romain@blogreen.org COMMENT= Python bindings for the Poppler PDF rendering library -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/poppler-glib.pc:${PORTSDIR}/graphics/poppler-gtk \ - ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo \ - ${LOCALBASE}/libdata/pkgconfig/pygtk-2.0.pc:${PORTSDIR}/x11-toolkits/py-gtk2 +LIB_DEPENDS= poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk USE_PYTHON= yes GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= pkgconfig atk +USE_GNOME= pkgconfig atk pygtk2 -.include <bsd.port.pre.mk> -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/py-poppler/distinfo b/graphics/py-poppler/distinfo index ef3e0360cda6..f84017df32ca 100644 --- a/graphics/py-poppler/distinfo +++ b/graphics/py-poppler/distinfo @@ -1,3 +1,3 @@ -MD5 (pypoppler-0.6.2.tar.gz) = b3bc6043e8e46f0cad7703c560f2faa7 -SHA256 (pypoppler-0.6.2.tar.gz) = d76802a7bc934d56db70f3899519fec83318eef3cdc0f7095188cde946efceab -SIZE (pypoppler-0.6.2.tar.gz) = 331206 +MD5 (pypoppler-0.8.1.tar.gz) = 43891cdfe5fc174a2df661810f00177f +SHA256 (pypoppler-0.8.1.tar.gz) = ffa8b3743159f9e4894f5bb8f5553abc81eb67835671e1f2d62b791f5c22153f +SIZE (pypoppler-0.8.1.tar.gz) = 336578 diff --git a/graphics/py-poppler/pkg-plist b/graphics/py-poppler/pkg-plist index 52387cb5dbf2..eacee987734d 100644 --- a/graphics/py-poppler/pkg-plist +++ b/graphics/py-poppler/pkg-plist @@ -1,3 +1,3 @@ @comment $FreeBSD$ -lib/python2.5/site-packages/poppler.so -lib/python2.5/site-packages/poppler.la +%%PYTHON_SITELIBDIR%%/poppler.la +%%PYTHON_SITELIBDIR%%/poppler.so diff --git a/graphics/ruby-cairo/Makefile b/graphics/ruby-cairo/Makefile index 7db9b376691e..6835953dbb92 100644 --- a/graphics/ruby-cairo/Makefile +++ b/graphics/ruby-cairo/Makefile @@ -3,12 +3,11 @@ # Whom: Mezz <mezz@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/graphics/ruby-cairo/Makefile,v 1.6 2008/02/28 21:28:18 mezz Exp $ +# $MCom: ports-stable/graphics/ruby-cairo/Makefile,v 1.1 2008/06/17 16:11:09 mezz Exp $ # PORTNAME= cairo -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.6.2 CATEGORIES= graphics ruby MASTER_SITES= http://cairographics.org/releases/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -26,6 +25,10 @@ CONFIGURE_ARGS+=--ruby=${RUBY} DOCS= AUTHORS COPYING ChangeLog GPL NEWS README +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local/lib/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \ + ${WRKSRC}/pkg-config.rb + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR}/agg diff --git a/graphics/ruby-cairo/distinfo b/graphics/ruby-cairo/distinfo index 24c7a0ba2466..c0b4fae67a30 100644 --- a/graphics/ruby-cairo/distinfo +++ b/graphics/ruby-cairo/distinfo @@ -1,3 +1,3 @@ -MD5 (rcairo-1.5.1.tar.gz) = 6778eaa1a32e289c47adcd40ef0f2595 -SHA256 (rcairo-1.5.1.tar.gz) = de937298cf8ffa129e452946ba52aa2614e930a77346895da2eec72c7700ef3b -SIZE (rcairo-1.5.1.tar.gz) = 68494 +MD5 (rcairo-1.6.2.tar.gz) = 062442e070d44984e11e34aac104d9f2 +SHA256 (rcairo-1.6.2.tar.gz) = 39b55519e51c82156b96d5e362020a5c5799c67ff7ce3e6499d324bebfe80015 +SIZE (rcairo-1.6.2.tar.gz) = 221770 diff --git a/graphics/ruby-cairo/pkg-plist b/graphics/ruby-cairo/pkg-plist index 087ebf14820a..581ae7381aad 100644 --- a/graphics/ruby-cairo/pkg-plist +++ b/graphics/ruby-cairo/pkg-plist @@ -9,6 +9,8 @@ %%RUBY_SITELIBDIR%%/cairo/context/path.rb %%RUBY_SITELIBDIR%%/cairo/context/rectangle.rb %%RUBY_SITELIBDIR%%/cairo/context/triangle.rb +%%RUBY_SITELIBDIR%%/cairo/paper.rb +%%RUBY_SITELIBDIR%%/cairo/papers.rb %%RUBY_SITELIBDIR%%/cairo/path.rb %%RUBY_SITELIBDIR%%/cairo/point.rb %%RUBY_SITEARCHLIBDIR%%/cairo.so diff --git a/graphics/vindaloo/Makefile b/graphics/vindaloo/Makefile index 53dfb4194838..658f9e1590ca 100644 --- a/graphics/vindaloo/Makefile +++ b/graphics/vindaloo/Makefile @@ -7,7 +7,7 @@ PORTNAME= vindaloo PORTVERSION= 0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnustep MASTER_SITES= http://download.gna.org/gsimageapps/Vindaloo/ DISTNAME= Vindaloo-${PORTVERSION} diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile index 3d274bc60915..1bdb4b9df1d4 100644 --- a/mail/claws-mail-pdf_viewer/Makefile +++ b/mail/claws-mail-pdf_viewer/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdf_viewer PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ PKGNAMEPREFIX= claws-mail- diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index 04949691e3cb..e56707472bac 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdfcube PORTVERSION= 0.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= # http://code.100allora.it/pdfcube/attachment/wiki/WikiStart/${DISTNAME}${EXTRACT_SUFX} diff --git a/sysutils/tracker-client/Makefile b/sysutils/tracker-client/Makefile index ab939c67d47c..026ed9b2c4d9 100644 --- a/sysutils/tracker-client/Makefile +++ b/sysutils/tracker-client/Makefile @@ -3,12 +3,12 @@ # Whom: Michael Johnson <ahze@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-stable/sysutils/tracker-client/Makefile,v 1.3 2008/03/31 00:27:41 ahze Exp $ +# $MCom: ports-stable/sysutils/tracker-client/Makefile,v 1.7 2008/06/16 22:18:40 mezz Exp $ # PORTNAME= tracker PORTVERSION= 0.6.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils gnome MASTER_SITES= http://www.gnome.org/~jamiemcc/tracker/ PKGNAMESUFFIX?= -client @@ -18,7 +18,7 @@ COMMENT= Object database, tag/metadata database, search tool and indexer LIB_DEPENDS= sqlite3.8:${PORTSDIR}/databases/sqlite3 \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ - poppler-glib.2:${PORTSDIR}/graphics/poppler-gtk \ + poppler-glib.3:${PORTSDIR}/graphics/poppler-gtk \ exif.12:${PORTSDIR}/graphics/libexif \ wv-1.2.3:${PORTSDIR}/textproc/wv \ gmime-2.0.4:${PORTSDIR}/mail/gmime2 \ diff --git a/www/Makefile b/www/Makefile index 91c23f547982..5f168f9a42d0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -191,6 +191,7 @@ SUBDIR += ffproxy SUBDIR += fhttpd SUBDIR += firefox + SUBDIR += firefox3 SUBDIR += firefox-devel SUBDIR += firefox-i18n SUBDIR += firefox-remote diff --git a/www/firefox3/Makefile b/www/firefox3/Makefile new file mode 100644 index 000000000000..85a048d9ba43 --- /dev/null +++ b/www/firefox3/Makefile @@ -0,0 +1,122 @@ +# New ports collection makefile for: phoenix +# Date created: 2002/10/21 +# Whom: Alan Eldridge <alane@FreeBSD.org> +# +# $FreeBSD$ +# $MCom: ports-stable/www/firefox3/Makefile,v 1.11 2008/06/30 16:07:29 mezz Exp $ +# + +PORTNAME= firefox +DISTVERSION= 3.0 +PORTREVISION= 2 +PORTEPOCH= 1 +CATEGORIES= www ipv6 +MASTER_SITES= ${MASTER_SITE_MOZILLA} +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTNAME= ${PORTNAME}-${DISTVERSION}-source + +MAINTAINER= gnome@FreeBSD.org +COMMENT= Web browser based on the browser portion of Mozilla + +BUILD_DEPENDS= nspr>=4.7:${PORTSDIR}/devel/nspr + +LATEST_LINK= firefox3 +USE_GECKO= gecko +MOZ_PKGCONFIG_FILES= # empty +USE_MOZILLA= -png -nss -dbm +MOZILLA_NAME= Firefox${MOZILLA_SUFX} +MOZILLA_SUFX= 3 +MOZILLA= ${PORTNAME}${MOZILLA_SUFX} +MOZ_TOOLKIT= cairo-gtk2 +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ + lib/${MOZILLA}/include lib/${MOZILLA}/lib \ + lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include + +WANT_GNOME= yes +ALL_TARGET= default +CONFIGURE_ENV= LOCALBASE=${LOCALBASE} +EXTRA_CFLAGS= -O2 +HAS_CONFIGURE= yes +USE_BZIP2= yes +USE_GMAKE= yes +NO_MOZPKGINSTALL=yes + +FIREFOX_ICON= ${MOZILLA}.png +FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png +MOZ_OPTIONS= --program-transform-name='s/firefox/${MOZILLA}/' \ + --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ + --enable-svg --enable-svg-renderer=cairo \ + --enable-application=browser \ + --enable-official-branding \ + --enable-canvas --enable-libxul + +SYSTEM_PREFS= ${FAKEDIR}/lib/${MOZILLA}/defaults/pref/firefox.js + +OPTIONS= DBUS "Enable D-BUS support" on \ + NEWTAB "Open external links in a new tab" on \ + SMB "Enable smb:// URI support using gnomevfs" off + +.include <bsd.port.pre.mk> + +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif + +.if defined(WITHOUT_DBUS) +MOZ_OPTIONS+= --disable-dbus +.else +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib +.endif + +post-extract:: + @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ + -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ + <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop + +post-patch: + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${WRKSRC}/storage/build/Makefile.in \ + ${WRKSRC}/db/sqlite3/src/Makefile.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/security/manager/ssl/src/Makefile.in +.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs + @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' \ + ${WRKSRC}/${ii}/all.js +.endfor + +port-pre-install: +# ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib + ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} + ${ECHO_CMD} "@dirrmtry share/applications" >> ${PLISTD} + ${ECHO_CMD} 'share/pixmaps/${FIREFOX_ICON}' >> ${PLISTF} +.if !defined(WITHOUT_NEWTAB) + ${ECHO_CMD} >> ${SYSTEM_PREFS} + ${ECHO_CMD} "// Open external links in new tab" >> ${SYSTEM_PREFS} + ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ + >> ${SYSTEM_PREFS} +.endif # !defined(WITHOUT_NEWTAB) + +do-install: + if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \ + for jpi in ${JPI_LIST}; do \ + if [ -f $${jpi} ]; then \ + ${LN} -sf $${jpi} \ + ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ; \ + break; \ + fi; \ + done; \ + fi + +post-install: + ${MKDIR} ${PREFIX}/share/applications ${PREFIX}/share/pixmaps + ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/ + ${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default + ${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON} + +.include <bsd.port.post.mk> diff --git a/www/firefox3/distinfo b/www/firefox3/distinfo new file mode 100644 index 000000000000..dfb6235e8ea3 --- /dev/null +++ b/www/firefox3/distinfo @@ -0,0 +1,3 @@ +MD5 (firefox-3.0-source.tar.bz2) = 4210ae0801df2eb498408533010d97c1 +SHA256 (firefox-3.0-source.tar.bz2) = 606e84ac02322aff692b9d4612cb8e27f5fa0da29e14bce7744927e0dad9c4b9 +SIZE (firefox-3.0-source.tar.bz2) = 37010746 diff --git a/www/firefox3/files/firefox.desktop.in b/www/firefox3/files/firefox.desktop.in new file mode 100644 index 000000000000..d72090e1aabf --- /dev/null +++ b/www/firefox3/files/firefox.desktop.in @@ -0,0 +1,191 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=@MOZILLA_NAME@ Web Browser +Name[am]= +Name[ar]= +Name[az]=@MOZILLA_NAME@ Veb Səyyahı +Name[be]= +Name[bg]=Интернет браузър @MOZILLA_NAME@ +Name[bn]= +Name[bs]=@MOZILLA_NAME@ web preglednik +Name[ca]=Navegador web @MOZILLA_NAME@ +Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ +Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ +Name[da]=@MOZILLA_NAME@ - internetsurfning +Name[de]=@MOZILLA_NAME@ Webbrowser +Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ +Name[en_CA]=@MOZILLA_NAME@ Web Browser +Name[en_GB]=@MOZILLA_NAME@ Web Browser +Name[es]=Navegador Web @MOZILLA_NAME@ +Name[et]=@MOZILLA_NAME@ veebibrauser +Name[eu]=@MOZILLA_NAME@ web arakatzailea +Name[fi]=@MOZILLA_NAME@, WWW-selain +Name[fr]=Navigateur Web @MOZILLA_NAME@ +Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ +Name[gu]=એપીફની વૅબ બ્રાઉઝર +Name[he]=דפדפן @MOZILLA_NAME@ +Name[hi]= +Name[hr]=@MOZILLA_NAME@ Web preglednik +Name[hu]=@MOZILLA_NAME@ webböngésző +Name[id]=Web Browser @MOZILLA_NAME@ +Name[it]=Browser web @MOZILLA_NAME@ +Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ +Name[ko]=@MOZILLA_NAME@ 웹 브라우저 +Name[li]=@MOZILLA_NAME@ Web Browser +Name[lt]=@MOZILLA_NAME@ web naršyklė +Name[mk]=@MOZILLA_NAME@ веб прелистувач +Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് +Name[mn]=@MOZILLA_NAME@ веб хөтөч +Name[ms]=Pelungsur Web @MOZILLA_NAME@ +Name[nb]=@MOZILLA_NAME@ nettleser +Name[nl]=@MOZILLA_NAME@ Webbrowser +Name[nn]=@MOZILLA_NAME@ nettlesar +Name[no]=@MOZILLA_NAME@ nettleser +Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ +Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ +Name[pt]=Navegador Web @MOZILLA_NAME@ +Name[pt_BR]=Navegador Web @MOZILLA_NAME@ +Name[ro]=Navigatorul @MOZILLA_NAME@ +Name[ru]=Веб-браузер @MOZILLA_NAME@ +Name[sk]= +Name[sl]=Spletni brskalnik @MOZILLA_NAME@ +Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web +Name[sr]= +Name[sr@Latn]=Veb čitač Spoznaja +Name[sv]=Webbläsaren @MOZILLA_NAME@ +Name[ta]=எபிபனி வலை உலாவி +Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi +Name[tr]=@MOZILLA_NAME@ Web Tarayıcı +Name[uk]=Переглядач web @MOZILLA_NAME@ +Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ +Name[wa]=Betchteu waibe epiphany +Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 +Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 +GenericName=Web Browser +GenericName[ar]=متصفّح الانترنت +GenericName[az]=Veb Səyyahı +GenericName[be]=Вандроўнік па павуціньню +GenericName[bg]=Браузър +GenericName[bn]=ওয়েব ব্রাউজার +GenericName[bs]=Web preglednik +GenericName[ca]=Navegador web +GenericName[cs]=Prohlížeč WWW +GenericName[cy]=Porwr Gwe +GenericName[da]=Internetsurfning +GenericName[de]=Webbrowser +GenericName[el]=Περιηγητής Ιστοσελίδων +GenericName[en_CA]=Web Browser +GenericName[en_GB]=Web Browser +GenericName[es]=Navegador web +GenericName[et]=Veebilehitseja +GenericName[eu]=Web arakatzailea +GenericName[fi]=WWW-selain +GenericName[fr]=Navigateur Web @MOZILLA_NAME@ +GenericName[ga]=Brabhsálaí Lín +GenericName[gu]=વેબ બ્રાઉઝર +GenericName[he]=דפדפן אינטרנט +GenericName[hi]=वेब ब्राउज़र +GenericName[hr]=Web preglednik +GenericName[hu]=Webböngésző +GenericName[id]=Browser Web +GenericName[it]=Browser web +GenericName[ja]=GNOME ウェブ・ブラウザ +GenericName[ko]=웹 브라우저 +GenericName[li]=Wèb Browser +GenericName[lt]=Web naršyklė +GenericName[mk]=Веб прелистувач +GenericName[mn]=Веб хөтөч +GenericName[ms]=Pelungsur Web +GenericName[nb]=Nettleser +GenericName[nl]=Web-browser +GenericName[nn]=Nettlesar +GenericName[no]=Nettleser +GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ +GenericName[pl]=Przeglądarka WWW +GenericName[pt]=Navegador Web +GenericName[pt_BR]=Navegador Web +GenericName[ro]=Navigator Internet +GenericName[ru]=Веб-браузер +GenericName[sk]=WWW prehliadač +GenericName[sl]=Spletni brskalnik +GenericName[sq]=Shfletuesi Web +GenericName[sr]=Веб читач +GenericName[sr@Latn]=Veb čitač +GenericName[sv]=Webbläsare +GenericName[ta]=வலை உலாவி +GenericName[th]=เว็บบราวเซอร์ +GenericName[tk]=Web Ahtarçysy +GenericName[tr]=Web Tarayıcı +GenericName[uk]=Переглядач web-сторінок +GenericName[vi]=Trình duyệt Web +GenericName[wa]=Betchteu waibe +GenericName[zh_CN]=Web 浏览器 +GenericName[zh_TW]=網頁瀏覽器 +Comment=Browse the web +Comment[ar]=تصفح الانترنت +Comment[az]=Vebi gəzin +Comment[be]=Вандраваць па павуціньню +Comment[bg]=Сърфиране в интернет +Comment[bn]=ওয়েব ব্রাউজ করুন +Comment[bs]=Pregledaj na internetu +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížet WWW +Comment[cy]=Pori'r we +Comment[da]=Surf på internettet +Comment[de]=Im Web surfen +Comment[el]=Περιήγηση στον παγκόσμιο ιστό +Comment[en_CA]=Browse the web +Comment[en_GB]=Browse the web +Comment[es]=Navegar por la web +Comment[et]=Sirvi veebi +Comment[eu]=Arakatu web-a +Comment[fi]=Selaa WWW:tä +Comment[fr]=Naviguer sur Internet +Comment[ga]=Brabhsáil an Líon +Comment[gu]=વેબમાં શોધો +Comment[he]=גלוש ברשת +Comment[hi]=वेब ब्राउज़ करें +Comment[hr]=Pregledaj Web +Comment[hu]=A világháló böngészése +Comment[id]=Jelajah web +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[li]=Blajere op internet +Comment[lt]=Naršyti internete +Comment[mk]=Прелистувајте на веб +Comment[ml]=വലക്കെട്ട് തിരയുക +Comment[mn]=Веб броузе хийх +Comment[ms]=Layari web +Comment[nb]=Surf på nettet +Comment[nl]=Websurfen +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegar na web +Comment[pt_BR]=Navegar na web +Comment[ro]=Navigare Internet +Comment[ru]=Веб-браузер +Comment[sk]=Prehliadať internet +Comment[sl]=Brskaj po spletu +Comment[sq]=Eksploro web-in +Comment[sr]=Прегледај веб +Comment[sr@Latn]=Pregledaj veb +Comment[sv]=Surfa på nätet +Comment[ta]=வலையில் உலாவு +Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ +Comment[tk]=Webi Ahtar +Comment[tr]=Web'e Gözat +Comment[uk]=Програма перегляду web-сторінок +Comment[vi]=Duyệt web +Comment[wa]=Naivyî avå les waibes +Comment[zh_CN]=浏览 Web +Comment[zh_TW]=瀏覽網頁 +Exec=@MOZILLA@ %u +Icon=@FIREFOX_ICON@ +StartupNotify=false +Terminal=false +Type=Application +Categories=Application;Network; +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; diff --git a/www/firefox3/files/patch-build_unix_run-mozilla.sh b/www/firefox3/files/patch-build_unix_run-mozilla.sh new file mode 100644 index 000000000000..a5295588ea97 --- /dev/null +++ b/www/firefox3/files/patch-build_unix_run-mozilla.sh @@ -0,0 +1,12 @@ +--- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006 ++++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006 +@@ -443,6 +443,9 @@ + export MOZILLA_FIVE_HOME LD_LIBRARY_PATH + export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + ++MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_linux_plugins ++export MOZ_PLUGIN_PATH ++ + if [ $moz_debug -eq 1 ] + then + moz_debug_program ${1+"$@"} diff --git a/www/firefox3/files/patch-config-mkdepend-imakemdep.h b/www/firefox3/files/patch-config-mkdepend-imakemdep.h new file mode 100644 index 000000000000..b688e664475d --- /dev/null +++ b/www/firefox3/files/patch-config-mkdepend-imakemdep.h @@ -0,0 +1,10 @@ +--- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +@@ -278,4 +278,7 @@ + "-D__i386__", + # endif ++# if defined(__amd64__) || defined(__x86_64__) ++ "-D__amd64__ -D__x86_64__", ++# endif + # ifdef __GNUC__ + "-traditional", diff --git a/www/firefox3/files/patch-config-rules.mk b/www/firefox3/files/patch-config-rules.mk new file mode 100644 index 000000000000..8ab35f5a8326 --- /dev/null +++ b/www/firefox3/files/patch-config-rules.mk @@ -0,0 +1,13 @@ +--- config/rules.mk.orig Thu Sep 14 14:07:03 2006 ++++ config/rules.mk Wed Oct 18 11:00:09 2006 +@@ -442,9 +442,7 @@ + endif + + ifeq ($(OS_ARCH),FreeBSD) +-ifdef IS_COMPONENT +-EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic +-endif ++EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc + endif + + ifeq ($(OS_ARCH),NetBSD) diff --git a/www/firefox3/files/patch-config_autoconf.mk.in b/www/firefox3/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..b39d9bacf0d7 --- /dev/null +++ b/www/firefox3/files/patch-config_autoconf.mk.in @@ -0,0 +1,21 @@ +--- config/autoconf.mk.in.orig 2007-08-28 12:02:43.000000000 -0400 ++++ config/autoconf.mk.in 2007-09-26 14:21:51.000000000 -0400 +@@ -58,14 +58,14 @@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ + bindir = @bindir@ +-includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++includedir = @includedir@/%%MOZILLA%% + libdir = @libdir@ + datadir = @datadir@ + mandir = @mandir@ +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) ++idldir = $(datadir)/idl/%%MOZILLA%% + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ diff --git a/www/firefox3/files/patch-config_mkdepend_Makefile.in b/www/firefox3/files/patch-config_mkdepend_Makefile.in new file mode 100644 index 000000000000..bace012a282e --- /dev/null +++ b/www/firefox3/files/patch-config_mkdepend_Makefile.in @@ -0,0 +1,10 @@ +--- config/mkdepend/Makefile.in.orig Sun Dec 12 07:36:57 2004 ++++ config/mkdepend/Makefile.in Sun Dec 12 07:37:55 2004 +@@ -57,6 +57,7 @@ + include $(topsrcdir)/config/rules.mk + + HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += $(XCFLAGS) + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox3/files/patch-content_xslt_public_txDouble.h b/www/firefox3/files/patch-content_xslt_public_txDouble.h new file mode 100644 index 000000000000..534bccba48be --- /dev/null +++ b/www/firefox3/files/patch-content_xslt_public_txDouble.h @@ -0,0 +1,20 @@ +--- content/xslt/public/txDouble.h.orig Fri Oct 13 00:00:29 2006 ++++ content/xslt/public/txDouble.h Fri Oct 13 00:00:53 2006 +@@ -41,7 +41,7 @@ + #define __txdouble_h__ + + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. +-#ifdef __FreeBSD__ ++/* #ifdef __FreeBSD__ + #include <ieeefp.h> + #ifdef __alpha__ + fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +@@ -50,7 +50,7 @@ + #endif + fp_except_t oldmask = fpsetmask(~allmask); + #endif +- ++*/ + /** + * Macros to workaround math-bugs bugs in various platforms + */ diff --git a/www/firefox3/files/patch-db_sqlite3_src_Makefile.in b/www/firefox3/files/patch-db_sqlite3_src_Makefile.in new file mode 100644 index 000000000000..71b84da6d4c2 --- /dev/null +++ b/www/firefox3/files/patch-db_sqlite3_src_Makefile.in @@ -0,0 +1,11 @@ +--- db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500 ++++ db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500 +@@ -45,6 +45,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++OS_CFLAGS = -I../../../dist/include/sqlite3 ++OS_LIBS = %%PTHREAD_LIBS%% + MODULE = sqlite3 + LIBRARY_NAME = sqlite3 + FORCE_SHARED_LIB = 1 diff --git a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp new file mode 100644 index 000000000000..41c462d74f62 --- /dev/null +++ b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp @@ -0,0 +1,46 @@ +--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 ++++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 +@@ -323,11 +323,11 @@ + prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", + &mStartLinksOnlyPref); + +- PRBool isSoundEnabled = PR_TRUE; ++ mIsSoundEnabled = PR_TRUE; + prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", +- &isSoundEnabled); ++ &mIsSoundEnabled); + nsXPIDLCString soundStr; +- if (isSoundEnabled) { ++ if (mIsSoundEnabled && mIsSoundEnabled) { + prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", + getter_Copies(soundStr)); + } +@@ -758,7 +758,7 @@ + } + else { + // No find string to backspace in! +- if (mIsBackspaceProtectOn) { ++ if (mIsBackspaceProtectOn && mIsSoundEnabled) { + // This flag should be on only if the last key was a backspace. + // It keeps us from accidentally hitting backspace too many times and + // going back in history when we really just wanted to clear +@@ -1012,7 +1012,9 @@ + + // Error sound (don't fire when backspace is pressed, they're + // trying to correct the mistake!) +- PlayNotFoundSound(); ++ if (mIsSoundEnabled) { ++ PlayNotFoundSound(); ++ } + + // Remove bad character from buffer, so we can continue typing from + // last matched character +@@ -1059,7 +1061,7 @@ + void + nsTypeAheadFind::PlayNotFoundSound() + { +- if (mNotFoundSoundURL.IsEmpty()) // no sound ++ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound + return; + if (!mSoundInterface) { + mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h new file mode 100644 index 000000000000..07ad43b4334d --- /dev/null +++ b/www/firefox3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h @@ -0,0 +1,12 @@ +--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 ++++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 +@@ -194,6 +194,9 @@ + + nsCString mNotFoundSoundURL; + ++ // Move the sound enabled boolean out for all methods to access. ++ PRBool mIsSoundEnabled; ++ + // PRBool's are used instead of PRPackedBool's where the address of the + // boolean variable is getting passed into a method. For example: + // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/www/firefox3/files/patch-js_src_jsnum.c b/www/firefox3/files/patch-js_src_jsnum.c new file mode 100644 index 000000000000..a3ef2769ab9c --- /dev/null +++ b/www/firefox3/files/patch-js_src_jsnum.c @@ -0,0 +1,28 @@ +--- js/src/jsnum.c.orig Sun Nov 5 18:37:07 2006 ++++ js/src/jsnum.c Sun Nov 5 18:42:31 2006 +@@ -45,6 +45,9 @@ + #if defined(XP_WIN) || defined(XP_OS2) + #include <float.h> + #endif ++#if defined(__FreeBSD__) ++#include <sys/param.h> ++#endif + #include <locale.h> + #include <limits.h> + #include <math.h> +@@ -532,7 +535,15 @@ static jsdouble NaN; + + #else + ++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000 ++#include <fenv.h> ++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT)) ++ ++#else ++ + #define FIX_FPU() ((void)0) ++ ++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ + + #endif + diff --git a/www/firefox3/files/patch-layout_generic_Makefile.in b/www/firefox3/files/patch-layout_generic_Makefile.in new file mode 100644 index 000000000000..038b5df63eed --- /dev/null +++ b/www/firefox3/files/patch-layout_generic_Makefile.in @@ -0,0 +1,14 @@ +--- layout/generic/Makefile.in.orig 2008-06-19 12:29:06.000000000 -0500 ++++ layout/generic/Makefile.in 2008-06-19 12:30:04.000000000 -0500 +@@ -188,9 +188,10 @@ + -I$(srcdir)/../../content/base/src \ + -I$(srcdir)/../../content/html/content/src \ + -I$(srcdir)/../../dom/src/base \ +- $(MOZ_CAIRO_CFLAGS) \ + $(NULL) + ++CXXFLAGS += $(MOZ_CAIRO_CFLAGS) ++ + ifdef MOZ_ENABLE_GTK2 + CXXFLAGS += $(MOZ_GTK2_CFLAGS) + endif diff --git a/www/firefox3/files/patch-security-coreconf-FreeBSD.mk b/www/firefox3/files/patch-security-coreconf-FreeBSD.mk new file mode 100644 index 000000000000..0f7a04a0279f --- /dev/null +++ b/www/firefox3/files/patch-security-coreconf-FreeBSD.mk @@ -0,0 +1,24 @@ +--- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 ++++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 +@@ -45,8 +45,12 @@ + ifeq ($(OS_TEST),alpha) + CPU_ARCH = alpha + else ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++else + CPU_ARCH = x86 + endif ++endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK + +@@ -73,7 +77,7 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ + ifdef MAPFILE + MKSHLIB += -Wl,--version-script,$(MAPFILE) + endif diff --git a/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp new file mode 100644 index 000000000000..f30d12229ccd --- /dev/null +++ b/www/firefox3/files/patch-security_manager_ssl_src_nsNSSComponent.cpp @@ -0,0 +1,10 @@ +--- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 ++++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 +@@ -110,6 +110,7 @@ + #include "nss.h" + #include "pk11func.h" + #include "ssl.h" ++#define NSS_ENABLE_ECC 1 + #include "sslproto.h" + #include "secmod.h" + #include "sechash.h" diff --git a/www/firefox3/files/patch-storage_build_Makefile.in b/www/firefox3/files/patch-storage_build_Makefile.in new file mode 100644 index 000000000000..18202a5a61d8 --- /dev/null +++ b/www/firefox3/files/patch-storage_build_Makefile.in @@ -0,0 +1,10 @@ +--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 ++++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 +@@ -77,6 +77,7 @@ + $(EXTRA_DSO_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ ++ %%PTHREAD_LIBS%% \ + $(NULL) + + include $(topsrcdir)/config/rules.mk diff --git a/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk b/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk new file mode 100644 index 000000000000..635c3c79c13c --- /dev/null +++ b/www/firefox3/files/patch-toolkit_mozapps_installer_packager.mk @@ -0,0 +1,11 @@ +--- toolkit/mozapps/installer/packager.mk.orig 2007-09-26 13:45:01.000000000 -0400 ++++ toolkit/mozapps/installer/packager.mk 2007-09-26 13:47:29.000000000 -0400 +@@ -409,7 +409,7 @@ + (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \ + (cd $(DESTDIR)$(includedir)/stable && tar -xf -) + # The dist/include has module subdirectories that we need to flatten +- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \; ++ find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \; + # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl) + $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable + $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable diff --git a/www/firefox3/files/patch-toolkit_xre_Makefile.in b/www/firefox3/files/patch-toolkit_xre_Makefile.in new file mode 100644 index 000000000000..4a9c8533a2f8 --- /dev/null +++ b/www/firefox3/files/patch-toolkit_xre_Makefile.in @@ -0,0 +1,8 @@ +--- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400 ++++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400 +@@ -263,5 +263,3 @@ + libs:: platform.ini + $(INSTALL) $^ $(DIST)/bin + +-install:: +- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) diff --git a/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc new file mode 100644 index 000000000000..9a41bbfc4602 --- /dev/null +++ b/www/firefox3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc @@ -0,0 +1,11 @@ +--- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 +@@ -8,7 +8,7 @@ + * 1 is AddRef + * 2 is Release + */ +-#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) ++#if !defined(__ia64) + NS_IMETHOD Stub3(); + NS_IMETHOD Stub4(); + NS_IMETHOD Stub5(); diff --git a/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in new file mode 100644 index 000000000000..cf4ffb04e511 --- /dev/null +++ b/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in @@ -0,0 +1,54 @@ +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 +@@ -49,6 +49,9 @@ + ifeq (86,$(findstring 86,$(OS_TEST))) + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp + endif ++ifeq (x86_64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp ++endif + endif + # + # New code for Linux, et. al., with gcc +@@ -60,7 +63,7 @@ + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -106,9 +109,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -294,6 +303,15 @@ + ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) + CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s ++endif ++# ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s ++endif + endif + # + # Solaris/SPARC diff --git a/www/firefox3/pkg-descr b/www/firefox3/pkg-descr new file mode 100644 index 000000000000..166df46a0e53 --- /dev/null +++ b/www/firefox3/pkg-descr @@ -0,0 +1,12 @@ +Firefox is an award winning, free, open-source web browser for many platforms +and is based on the Mozilla codebase. It is small, fast and easy to use, and +offers many advanced features: + o Popup Blocking + o Tabbed Browsing + o Live Bookmarks (ie. RSS) + o Extensions + o Themes + o FastFind + o Improved Security + +WWW: http://www.mozilla.com/firefox diff --git a/www/firefox3/pkg-message b/www/firefox3/pkg-message new file mode 100644 index 000000000000..5c9d24b32e4e --- /dev/null +++ b/www/firefox3/pkg-message @@ -0,0 +1,32 @@ +====================================================================== + +SMB issues: +Network group, machine, and share browsing does not work correctly. + +SFTP: +Only sftp access using public key authentication works. To easily +setup public key authentication to "remote_host": + +ssh-keygen -t dsa +cat ~/.ssh/id_dsa.pub | ssh remote_host "cat >> .ssh/authorized_keys" + +The SSH sever on remote_host must allow pub key authentication. + +====================================================================== + +Any bug reports should be addressed to the maintainers at: + gnome@FreeBSD.org +You may also Cc: freebsd-ports@FreeBSD.org. Please do not send +bug reports to any other addresses. + +Please include the following information with any bug report: +* Output from 'uname -a'. +* Date/time stamp from www/firefox-devel/Makefile. +* Where/when did the problem occur: configuring, building, or + running firefox +* How can you reproduce the problem? + +Thank you for your help in testing and reporting bugs, and we hope you +enjoy using Firefox. +The Maintainers (gnome@) +====================================================================== diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 75b80f35d298..020d1c671082 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,11 +3,11 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.43 2007/03/16 15:29:49 ahze Exp $ +# $MCom: ports-stable/www/mozilla/Makefile,v 1.18 2008/06/16 22:25:44 mezz Exp $ PORTNAME= mozilla PORTVERSION= 1.7.13 -PORTREVISION?= 7 +PORTREVISION?= 8 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 16b845c538db..ef6e6f4d1219 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,435 +1,2 @@ -# Makefile.common handles common tasks and dependencies for mozilla ports. -# -# Date created: 12 Nov 2005 -# Whom: Michael Johnson <ahze@FreeBSD.org> -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile.common,v 1.45 2007/02/06 00:05:55 ahze Exp $ - -# This file contains some reusable components for mozilla ports. It's of -# use primarily to apps from the mozilla project itself (such as Firefox, -# Thunderbird, etc.), and probably won't be of use for gecko-based ports -# like epiphany, galeon, etc. The reusable components for gecko-based ports -# lives in www/mozilla/bsd.gecko.mk. -# -# -# Ports can use the following: -# -# GECKO_PLIST_PRE_FILES List of files to add to the beginning of plist -# GECKO_PLIST_PRE_DIRS -# -# MOZILLA_PLIST_DIRS List of directories to descend into when -# installing and creating the plist -# MOZ_PIS_SCRIPTS List of scripts residing in ${FILESDIR} to -# be filtered through MOZCONFIG_SED and installed -# along with our Pluggable Init Scripts (PIS) -# MOZ_SED_ARGS sed(1) commands through which MOZ_PIS_SCRIPTS -# are filtered. There is a default set defined here, -# so you probably want to add to MOZ_SED_ARGS rather -# than clobber it -# -# MOZ_OPTIONS configure arguments (added to .mozconfig). If -# NOMOZCONFIG is defined, you probably want to set -# CONFIGURE_ARGS+=${MOZ_OPTIONS} -# MOZ_MK_OPTIONS make(1) arguments (added to .mozconfig). If -# NOMOZCONFIG is defined, you probably want to set -# MAKE_ARGS+=${MOZ_MK_OPTIONS} -# MOZ_EXPORT environment variables for the build process -# (added to .mozconfig). If NOMOZCONFIG is defined, -# you probably want to set MAKE_ENV+=${MOZ_EXPORT} -# MOZ_EXTENSIONS A list of extensions to build -# MOZ_GRAPHICS A list of image decoders to build -# MOZ_PROTOCOLS A list of protocols to build (http, ftp, etc.) -# -# PORT_MOZCONFIG Defaults to ${FILESDIR}/mozconfig.in, but can -# be set to a generic mozconfig included with -# the port -# -# NOGECKO_INSTALL Don't install the built gecko (most likely -# for testing) -# NOGECKO_PLIST Don't create a dynamically-generated playlist -# NOMOZCONFIG Don't drop a customized .mozconfig into the -# build directory. Options will have to be -# specified in CONFIGURE_ARGS instead - -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - nspr4:${PORTSDIR}/devel/nspr \ - nss3:${PORTSDIR}/security/nss - -MAINTAINER?= gnome@FreeBSD.org - -MOZILLA?= ${PORTNAME} -MOZILLA_VER?= ${PORTVERSION} -MOZILLA_BIN?= ${PORTNAME}-bin -MOZ_RPATH?= ${MOZILLA} -USE_GNOME+= gtk20 libidl desktopfileutils -USE_ICONV= yes -USE_PERL5_BUILD=yes -USE_XORG= printproto sm xt xi xext x11 xinerama \ - ice xproto - -MOZILLA_SUFX?= none -WRKSRC?= ${WRKDIR}/mozilla -FAKEDIR?= ${WRKDIR}/fake -PLIST?= ${WRKDIR}/plist -MASTER_DIR?= ${.CURDIR}/../../www/mozilla - -KRB5_HOME?= /usr -BROWSER_PLUGINS_DIR?= lib/browser_plugins -MOZ_PIS_DIR?= lib/${MOZILLA}/init.d - -ESD_LIB?= libesd.so.2 -FREETYPE_LIB?= libfreetype.so.9 - -GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/mozilla/files/mozconfig-generic.in -PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in -MOZCONFIG?= ${WRKSRC}/.mozconfig -MOZILLA_PLIST_DIRS?= bin include lib share/idl -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} -PKGINSTALL?= ${WRKDIR}/pkg-install -PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall -MASTER_MOZDIR?= ${PORTSDIR}/www/mozilla -PKGINSTALL_INC?= ${MASTER_MOZDIR}/pkg-install.in -PKGDEINSTALL_INC?= ${MASTER_MOZDIR}/pkg-deinstall.in - -EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ - --exclude */macbuild/* \ - --exclude */package/* \ - --exclude mozilla/jpeg \ - --exclude mozilla/dbm \ - --exclude mozilla/security/nss \ - --exclude mozilla/gc/boehm \ - --exclude mozilla/gfx/cairo - -JPI_LIST?=\ - ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns7/libjavaplugin_oji.so \ - ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so - -MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ - ${MOZILLA}-xpcom ${MOZILLA}-plugin - -CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} -LIBS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv - -_USE_GECKO_OPTIONS_ALL= java debug logging optimized_cflags - -.if !defined(USE_GECKO_OPTIONS) -USE_GECKO_OPTIONS= debug logging optimized_cflags -.endif - -debug_OPTION= "Build a debugging image" off -java_OPTION= "Enable JAVA xpcom" off -logging_OPTION= "Enable additional log messages" off -optimized_cflags_OPTION= "Enable some additional optimizations" off - -.for option in ${USE_GECKO_OPTIONS:L} -.if ${_USE_GECKO_OPTIONS_ALL:M${option}}!="" -OPTIONS+= ${option:U} ${${option}_OPTION} -_${option}= ${TRUE} -.endif -.endfor - -# Standard options from README -MOZ_TOOLKIT?= gtk2 -MOZ_OPTIONS+= --enable-crypto \ - --disable-tests \ - --enable-default-toolkit=${MOZ_TOOLKIT} \ - --enable-xft \ - --with-pthreads -# Configure options for install -MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \ - --x-libraries=${LOCALBASE}/lib -.if !defined(MOZ_EXTENSIONS) -MOZ_OPTIONS+= --enable-extensions=default -.else -MOZ_OPTIONS+= --enable-extensions=${MOZ_EXTENSIONS} -.endif -.if !defined(MOZ_GRAPHICS) -MOZ_OPTIONS+= --enable-image-decoders=default -.else -MOZ_OPTIONS+= --enable-image-decoders=${MOZ_GRAPHICS} -.endif -.if !defined(MOZ_PROTOCOLS) -MOZ_OPTIONS+= --enable-necko-protocols=default -.else -MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS} -.endif -# others -MOZ_OPTIONS+= --with-system-jpeg=${LOCALBASE} \ - --with-system-zlib=/usr \ - --with-system-png=${LOCALBASE} \ - --with-gssapi=${KRB5_HOME} \ - --with-system-nspr \ - --disable-auto-deps \ - --enable-chrome-format=jar \ - --disable-cpp-exceptions \ - --disable-cpp-rtti \ - --disable-glibtest \ - --disable-gtktest \ - --disable-freetypetest \ - --enable-double-buffer \ - --enable-mathml \ - --disable-installer \ - --disable-md \ - --disable-pedantic \ - --disable-bidi \ - --disable-xterm-updates \ - --enable-xinerama -MOZ_MK_OPTIONS+= XP_UNIX=1 \ - PERL=${PERL} - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= ${CFLAGS} -O2 -fno-strict-aliasing ${EXTRA_CFLAGS} -WITH_OPTIMIZE?= -O2 -.else -CFLAGS:= ${CFLAGS} ${EXTRA_CFLAGS} -WITH_OPTIMIZE?= -.endif - -.if defined(WITH_SMB) -USE_GNOME+= gnomevfs2 -MOZ_OPTIONS+= --enable-gnomevfs -.endif - -.if defined(WITH_DEBUG) -MOZ_OPTIONS+= --enable-debug \ - --disable-strip -WITH_LOGGING= yes -.else -MOZ_OPTIONS+= --disable-debug \ - --enable-optimize=${WITH_OPTIMIZE} \ - --enable-strip -.endif - -.if defined(WITH_JAVA) && defined(_WITH_JAVA) -USE_JAVA= yes -JAVA_VERSION+= 1.4+ -JAVA_OS+= native -CONFIGURE_ENV+= JAVA_HOME="${JAVA_HOME}" -MOZ_OPTIONS+= --enable-javaxpcom -.endif - -.if defined(WITH_LOGGING) -MOZ_OPTIONS+= --enable-logging -.else -MOZ_OPTIONS+= --disable-logging -.endif - -MOZ_SED_ARGS+= -e's|@CPPFLAGS@|${CPPFLAGS}|g' \ - -e 's|@CFLAGS@|${CFLAGS}|g' \ - -e 's|@LDFLAGS@|${LDFLAGS}|g' \ - -e 's|@LIBS@|${LIBS}|g' \ - -e 's|@LOCALBASE@|${LOCALBASE}|g' \ - -e 's|@FAKEDIR@|${FAKEDIR}|g' \ - -e 's|@PERL@|${PERL5}|g' \ - -e 's|@KRB5_HOME@|${KRB5_HOME}|g' \ - -e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g' \ - -e 's|%%PREFIX%%|${PREFIX}|g' \ - -e 's|%%CFLAGS%%|${CFLAGS}|g' \ - -e 's|%%LDFLAGS%%|${LDFLAGS}|g' \ - -e 's|%%LIBS%%|${LIBS}|g' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - -e 's|%%FAKEDIR%%|${FAKEDIR}|g' \ - -e 's|%%PERL%%|${PERL5}|g' \ - -e 's|%%KRB5_HOME%%|${KRB5_HOME}|g' \ - -e 's|%%MOZILLA%%|${MOZILLA}|g' \ - -e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g' \ - -e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g' -MOZCONFIG_SED?= ${SED} ${MOZ_SED_ARGS} - -.if ${ARCH}=="i386" && (${OSVERSION} >= 700000 || exists(/usr/lib/libbz2_p.a)) -LIB_BZ2= -lbz2_p -.else -LIB_BZ2= -lbz2 -.endif - -.if ${ARCH}=="sparc64" -# Work around miscompilation/mislinkage of the sCanonicalVTable hacks. -MOZ_OPTIONS+= --disable-v1-string-abi -.endif - -post-patch: gecko-post-patch gecko-moz-pis-patch - -gecko-post-patch: -.if exists(${PKGINSTALL_INC}) - @${MOZCONFIG_SED} < ${PKGINSTALL_INC} > ${PKGINSTALL} -.endif -.if exists(${PKGDEINSTALL_INC}) - @${MOZCONFIG_SED} < ${PKGDEINSTALL_INC} > ${PKGDEINSTALL} -.endif - @${RM} -f ${MOZCONFIG} -.if !defined(NOMOZCONFIG) -.if exists(${GENERIC_MOZCONFIG}) - @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG} -.endif - @if [ -e ${PORT_MOZCONFIG} ] ; then \ - ${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \ - fi -.for arg in ${MOZ_OPTIONS} - @${ECHO_CMD} ac_add_options ${arg} >> ${MOZCONFIG} -.endfor -.for arg in ${MOZ_MK_OPTIONS} - @${ECHO_CMD} mk_add_options ${arg} >> ${MOZCONFIG} -.endfor -.for var in ${MOZ_EXPORT} - @${ECHO_CMD} "export ${var}" >> ${MOZCONFIG} -.endfor -.endif # .if !defined(NOMOZCONFIG) - @${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 - @${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|%%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 - @if [ -d ${WRKSRC}/directory/c-sdk ]; then \ - ${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/configure ; \ - fi - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g ; \ - s|echo aout|echo elf|g ; \ - s|/usr/X11R6|${LOCALBASE}|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ - ${WRKSRC}/*/*/*/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g ; \ - s|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ - ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -# handles mozilla pis scripts. -gecko-moz-pis-patch: -.for moz in ${MOZ_PIS_SCRIPTS} - @${MOZCONFIG_SED} < ${FILESDIR}/${moz} > ${WRKDIR}/${moz} -.endfor - -post-configure: gecko-post-configure - -gecko-post-configure: - @${ECHO_CMD} "#define JNIIMPORT" >> ${WRKSRC}/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 - -pre-install: gecko-moz-pis-pre-install gecko-pre-install port-pre-install gecko-create-plist - -.if !target(port-pre-install) -port-pre-install: - @${DO_NADA} -.endif - -gecko-pre-install: -.if !defined(NOGECKO_PLIST) - @${RM} -rf ${FAKEDIR} ${PLIST} - @${TOUCH} -f ${PLIST} - @cd ${WRKSRC} && ${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} - ${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config -.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||} - ${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \ - ${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc -.endfor - @${REINPLACE_CMD} -e 's|${MOZILLA}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}|; \ - s|$${progbase}-bin|${MOZILLA:S/${MOZILLA_SUFX}//}-bin|' \ - ${FAKEDIR}/bin/${MOZILLA} \ - ${FAKEDIR}/bin/${MOZILLA}-config -.endif - @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${FAKEDIR}/bin/${MOZILLA} \ - ${FAKEDIR}/bin/${MOZILLA}-config - ${RM} -f ${FAKEDIR}/bin/*.bak -.endif - -gecko-create-plist: -.if !defined(NOGECKO_PLIST) -# Create the plist -.for f in ${GECKO_PLIST_PRE_FILES} - ${ECHO_CMD} ${f} >> ${PLIST} -.endfor -.for f in ${GECKO_PLIST_PRE_DIRS} - ${ECHO_CMD} "@dirrm ${f}" >> ${PLIST} -.endfor - ${ECHO_CMD} "${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/${BROWSER_PLUGINS_DIR} 2>/dev/null || ${TRUE}" >> ${PLIST} - ${MKDIR} ${FAKEDIR}/libdata - ${MV} -f ${FAKEDIR}/lib/pkgconfig ${FAKEDIR}/libdata/ - ${RM} -f ${FAKEDIR}/lib/pkgconfig -.for dir in ${MOZILLA_PLIST_DIRS} - @cd ${FAKEDIR}/${dir} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|${dir}/|' >> ${PLIST} && \ - ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST} -.endfor -.for pcfile in ${MOZ_PKGCONFIG_FILES} - ${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST} - @${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \ - -e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \ - ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc -.endfor - ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || ${TRUE}" >> ${PLIST} -.endif # !defined(NOGECKO_PLIST) - -do-install: gecko-do-install - -gecko-do-install: -.if !defined(NOGECKO_INSTALL) -.for dir in ${MOZILLA_PLIST_DIRS} -.if !exists(${PREFIX}/${dir}) - ${MKDIR} ${PREFIX}/${dir} - ${CHMOD} 755 ${PREFIX}/${dir} -.endif - cd ${FAKEDIR}/${dir} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir} -.endfor -.for pcfile in ${MOZ_PKGCONFIG_FILES} - ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ - ${PREFIX}/libdata/pkgconfig/${pcfile}.pc -.endfor - ${MKDIR} ${PREFIX}/${BROWSER_PLUGINS_DIR} - ${TOUCH} -f ${PREFIX}/${BROWSER_PLUGINS_DIR}/.${MOZILLA}.keep -.endif # !defined(NOGECKO_INSTALL) - -gecko-moz-pis-pre-install: -.if defined(MOZ_PIS_SCRIPTS) - ${MKDIR} ${FAKEDIR}/${MOZ_PIS_DIR} -.for moz in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/${moz} ${FAKEDIR}/${MOZ_PIS_DIR} -.endfor -.endif - -post-install: gecko-post-install - -gecko-post-install: -.if !defined(PACKAGE_BUILDING) - @if [ -e ${PKGINSTALL} ] ; then \ - ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL; \ - fi -.endif - @-update-desktop-database +USE_GECKO=gecko +.include "${PORTSDIR}/Mk/bsd.gecko.mk" diff --git a/www/mozilla/bsd.gecko.mk b/www/mozilla/bsd.gecko.mk index 0cf28d615805..8003155fa22f 100644 --- a/www/mozilla/bsd.gecko.mk +++ b/www/mozilla/bsd.gecko.mk @@ -1,170 +1 @@ -#-*- mode: Fundamental; tab-width: 4; -*- -# ex:ts=4 -# -# $FreeBSD$ -# $MCom: ports/www/mozilla/bsd.gecko.mk,v 1.30 2006/12/09 15:32:06 ahze Exp $ -# -# 4 column tabs prevent hair loss and tooth decay! - -# bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users -# and porters to support any available gecko backend without needing to build -# many conditional tests. ${USE_GECKO} is the list of backends that your port -# can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. -# Users set ${WITH_GECKO} to the list of gecko backends they want on their system. - -.if defined(USE_GECKO) -#.if defined(_POSTMKINCLUDED) && !defined(Gecko_Pre_Include) - -# Please make sure all changes to this file are passed through the maintainer. -# Do not commit them yourself (unless of course you're the Port's Wraith ;). -Gecko_Include_MAINTAINER= gnome@FreeBSD.org -Gecko_Pre_Include= bsd.gecko.mk - - -# Users should use the following syntax: -# -# WITH_GECKO= mozilla firefox seamonkey -# Use mozilla whenever a port supports it, falling back on firefox and -# then seamonkey. -# WITH_GECKO= firefox -# Sets your preferred backend. With this example, firefox will always -# be chosen, unless the port doesn't support a firefox backend. In that -# case, you get whatever the porter chose as the default. Better to use -# the first example. -# -# -# Ports should use the following: -# -# USE_GECKO= mozilla firefox seamonkey -# The list of gecko backends that the port supports. Unless the user -# overrides it with WITH_GECKO, the first gecko listed in USE_GECKO -# will be the default. In the above example, www/mozilla will be used -# as a gecko backend unless WITH_GECKO=firefox or WITH_GECKO=seamonkey -# is defined by the user. -# -# USE_GECKO= firefox-devel<->firefox -# This will sed -e 's/firefox/firefox-devel/' on Makefile.in's and configure -# if ${GECKO}=="firefox-devel" -# -# Example: -# USE_GECKO= mozilla firefox seamonkey -# .include <bsd.port.pre.mk> -# .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -# post-patch: -# @${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \ -# ${WRKSRC}/configure -# -# If you want your port to check the ${GECKO} variable to see which backend -# has been chosen. -# -# Example: -# USE_GECKO= mozilla firefox seamonkey -# .include <bsd.port.pre.mk> -# .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" -# post-patch: -# .if ${GECKO}=="seamonkey" -# @${REINPLACE_CMD} -e 's|mozilla-|seamonkey-|' \ -# ${WRKSRC}/configure -# .endif - -.if (${ARCH}!="sparc64" || ${OSVERSION} >= 601101) && ${ARCH}!="ia64" -_GECKO_ALL= firefox nvu seamonkey thunderbird xulrunner flock -.endif -_GECKO_ALL+= mozilla - -thunderbird_PORTSDIR= mail - -.for gecko in ${_GECKO_ALL} -${gecko}_PORTSDIR?= www -${gecko}_DEPENDS?= ${PORTSDIR}/${${gecko}_PORTSDIR}/${gecko} -${gecko}_PLIST?= ${LOCALBASE}/lib/${gecko}/libgtkembedmoz.so -.endfor - -# Figure out which mozilla to use -# Weed out bad options in USE_GECKO -.for badgecko in ${USE_GECKO} -. if ${_GECKO_ALL:M${badgecko:C/^([^<->]+).*/\1/}}!="" -GOOD_USE_GECKO+= ${badgecko:C/^([^<->]+).*/\1/} -. endif -. if ${_GECKO_ALL:M${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}}!="${badgecko:C/^([^<->]+).*/\1/}" -${badgecko:C/^([^<->]+).*/\1/}_HACK= s:${badgecko:C/^[^<->]+<->([^<->]+).*/\1/}:${badgecko:C/^([^<->]+).*/\1/}:g -. endif -.endfor - -.undef GECKO_FALLTHROUGH -.undef _FOUND_WITH_GECKO -# Figure out which gecko to use and weed out the bad ones -.if defined(WITH_GECKO) && defined(GOOD_USE_GECKO) -. for badgecko in ${WITH_GECKO} -. if ${GOOD_USE_GECKO:M${badgecko}}!="" -GOOD_WITH_GECKO+= ${badgecko} -. endif -. endfor -. if defined(GOOD_WITH_GECKO) -. for gecko in ${GOOD_WITH_GECKO} -. if !defined(GECKO_FALLTHROUGH) -GECKO= ${gecko} -GECKO_FALLTHROUGH= ${TRUE} -_FOUND_WITH_GECKO= ${TRUE} -. endif -. endfor -. endif -.endif - -.if !defined(GECKO) && defined(GOOD_USE_GECKO) -. for gecko in ${GOOD_USE_GECKO} -. if !defined(GECKO_FALLTRHOUGH) -GECKO= ${gecko} -GECKO_FALLTRHOUGH= ${TRUE} -. endif -. endfor -.endif - -# Generic defines -BROWSER_LINUX_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_linux_plugins -BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins - -GECKO_CONFIG?= ${LOCALBASE}/bin/${GECKO}-config -XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl -XPIDL_INCL?= `${GECKO_CONFIG} --idlflags` - -.if defined(GECKO) && ${_GECKO_ALL:M${GECKO}}!="" -BUILD_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -RUN_DEPENDS+= ${${GECKO}_PLIST}:${${GECKO}_DEPENDS} -.else -IGNORE= Unable to find a supported gecko, please check USE_GECKO -GECKO= # -.endif - -pre-everything:: _gecko-pre-everything - -_gecko-pre-everything:: - @${ECHO_CMD} "" -.if !defined(_FOUND_WITH_GECKO) && defined(WITH_GECKO) - @${ECHO_CMD} " Warning: ${PORTNAME} does not support any gecko you" - @${ECHO_CMD} " listed in WITH_GECKO=${WITH_GECKO}." - @${ECHO_CMD} " \"${GECKO}\" will be used" - @${ECHO_CMD} "" - @${ECHO_CMD} " for gecko support, but you can change that by using one of" - @${ECHO_CMD} " the following values:" -.else - @${ECHO_CMD} " ${PORTNAME} is using ${GECKO} for gecko support, but you can" - @${ECHO_CMD} " change that by defining WITH_GECKO to the following values:" -.endif - @${ECHO_CMD} "" -.for gecko in ${GOOD_USE_GECKO} - @${ECHO_CMD} " ${gecko} " -.endfor - @${ECHO_CMD} "" - -post-patch: gecko-post-patch - -gecko-post-patch: -.if defined(${GECKO}_HACK) - ${FIND} ${WRKSRC} -name "Makefile.in" -type f -o -name "configure" -type f | \ - ${XARGS} ${REINPLACE_CMD} -e ${${GECKO}_HACK} -.endif - -#.endif # end it all -.endif -# HERE THERE BE TACOS +.include "${PORTSDIR}/Mk/bsd.gecko.mk" diff --git a/www/mozilla/pkg-deinstall.in b/www/mozilla/pkg-deinstall.in index 4a0a2fba8c36..a7325eabd2da 100644 --- a/www/mozilla/pkg-deinstall.in +++ b/www/mozilla/pkg-deinstall.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.19 2006/12/09 15:32:06 ahze Exp $ +# $MCom: ports-stable/www/mozilla/pkg-deinstall.in,v 1.11 2008/06/16 21:36:02 mezz Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/www/mozilla/pkg-install.in b/www/mozilla/pkg-install.in index 8fcc2b0ea088..422ce3677545 100644 --- a/www/mozilla/pkg-install.in +++ b/www/mozilla/pkg-install.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $MCom: ports/www/mozilla/pkg-install.in,v 1.19 2006/12/09 15:32:06 ahze Exp $ +# $MCom: ports-stable/www/mozilla/pkg-install.in,v 1.11 2008/06/16 21:36:02 mezz Exp $ # # Date created: Mon Nov 29, 2003 # Whom: Thierry Thomas (<thierry@pompo.net>) diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index b0d363c27521..1b0b97016526 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -6,13 +6,16 @@ # PORTNAME= pixman -PORTVERSION= 0.9.6 +PORTVERSION= 0.10.0 +PORTREVISION= 2 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org COMMENT= Low-level pixel manipulation library XORG_CAT= lib +USE_AUTOTOOLS= libtool:15 +USE_GNOME= ltverhack:9 post-patch: @${REINPLACE_CMD} -e 's|gtk+-2\.0|disable-gtk|g' \ diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index 00d580a7dc02..a24f00bb7c13 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/lib/pixman-0.9.6.tar.bz2) = 7681334f55d41a705339228145d02c11 -SHA256 (xorg/lib/pixman-0.9.6.tar.bz2) = c504db9338d67c388824ebbf805a424d2cc0fab681e33bff6733603539d6335b -SIZE (xorg/lib/pixman-0.9.6.tar.bz2) = 290399 +MD5 (xorg/lib/pixman-0.10.0.tar.bz2) = fb23e17a8a0308e8fad6dc153753ba9a +SHA256 (xorg/lib/pixman-0.10.0.tar.bz2) = 2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4 +SIZE (xorg/lib/pixman-0.10.0.tar.bz2) = 312275 diff --git a/x11/pixman/pkg-plist b/x11/pixman/pkg-plist index 43a14ba948cc..66d6a4342aee 100644 --- a/x11/pixman/pkg-plist +++ b/x11/pixman/pkg-plist @@ -1,3 +1,4 @@ +include/pixman-1/pixman-version.h include/pixman-1/pixman.h lib/libpixman-1.a lib/libpixman-1.la |