Index: head/www/galeon/Makefile =================================================================== --- head/www/galeon/Makefile (revision 72276) +++ head/www/galeon/Makefile (revision 72277) @@ -1,101 +1,100 @@ # Ports collection Makefile for: galeon # Date created: 1 August 2000 # Whom: Maxim Sobolev # # $FreeBSD$ # PORTNAME= galeon -PORTVERSION= 1.2.6 -PORTREVISION= 1 +PORTVERSION= 1.2.7 CATEGORIES= www gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= gnome@FreeBSD.org BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \ ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} -MOZ_CONFIGURE_ARGS= +MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="1.1" .if !defined(WITH_MOZILLA) MOZILLA= mozilla HEADERS_SUFX= .else .if ${WITH_MOZILLA}=="mozilla-vendor" || ${WITH_MOZILLA}=="mozilla-embedded-vendor" MOZILLA= ${WITH_MOZILLA} HEADERS_SUFX= -vendor MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.0" .else .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel" MOZILLA= ${WITH_MOZILLA} HEADERS_SUFX= -devel -MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="trunk" +MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.2" .else .if ${WITH_MOZILLA}=="mozilla-embedded" MOZILLA= mozilla-embedded HEADERS_SUFX= .else MOZILLA= mozilla HEADERS_SUFX= .endif .endif .endif .endif USE_X_PREFIX= yes USE_GNOMENG= yes USE_GNOME= gnomeprefix gnomehack bonobo libglade gnomevfs USE_LIBTOOL= yes USE_REINPLACE= yes CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \ --with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \ --enable-nautilus-view \ ${MOZ_CONFIGURE_ARGS} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= galeon.1 .include .if ${OSVERSION} > 500000 # Galeon does not build correctly in -CURRENT if -Werror is passed # to the compiler. CONFIGURE_ARGS+= --disable-werror .endif post-extract: @${ECHO_MSG} @${ECHO_MSG} " By default the port uses www/mozilla for html rendering, but you can change" @${ECHO_MSG} " this by defining WITH_MOZILLA to one of the following values:" @${ECHO_MSG} @${ECHO_MSG} " mozilla-devel " @${ECHO_MSG} " mozilla-embedded[-devel|-vendor] " @${ECHO_MSG} " mozilla-vendor " @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${FIND} ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \ 's|-lpthread|${PTHREAD_LIBS}|g' @${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \ 's|malloc\.h|stdlib.h|g' @${MKDIR} ${WRKSRC}/src/libnautilus post-configure: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \ s|%%LOCALBASE%%|${LOCALBASE}|g ; \ s|%%X11BASE%%|${X11BASE}|g ; \ s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon \ ${WRKSRC}/src/nautstub.c pre-install: @-${X11BASE}/bin/gconftool --shutdown .include Property changes on: head/www/galeon/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.90 \ No newline at end of property +1.91 \ No newline at end of property Index: head/www/galeon/distinfo =================================================================== --- head/www/galeon/distinfo (revision 72276) +++ head/www/galeon/distinfo (revision 72277) @@ -1 +1 @@ -MD5 (galeon-1.2.6.tar.gz) = 85738f037bef3504e08173e4d30e4ae3 +MD5 (galeon-1.2.7.tar.gz) = 2408b7e6b1a2a2655f6720b41a391f4b Property changes on: head/www/galeon/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.41 \ No newline at end of property +1.42 \ No newline at end of property Index: head/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp =================================================================== --- head/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp (revision 72276) +++ head/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp (revision 72277) @@ -1,11 +1,29 @@ ---- src/mozilla/GaleonWrapper.cpp.orig Mon Sep 16 12:42:40 2002 -+++ src/mozilla/GaleonWrapper.cpp Mon Sep 16 12:42:47 2002 -@@ -182,7 +182,7 @@ - } - else +--- src/mozilla/GaleonWrapper.cpp.orig Thu Jan 2 13:55:14 2003 ++++ src/mozilla/GaleonWrapper.cpp Thu Jan 2 13:56:16 2003 +@@ -80,8 +80,10 @@ + #include "caps/nsIPrincipal.h" + #include "nsIDeviceContext.h" + #include "nsIPresContext.h" ++#if MOZILLA_SNAPSHOT > 2 + #include "nsITypeAheadFind.h" + #include "nsSupportsPrimitives.h" ++#endif + + GaleonWrapper::GaleonWrapper () + { +@@ -584,6 +586,7 @@ + PRBool search_in_frames, + PRBool *didFind) + { ++#if MOZILLA_SNAPSHOT > 2 + if (!interactive) { --#if MOZILLA_SNAPSHOT > 1 -+#if MOZILLA_SNAPSHOT > 0 - result = print->PrintPreview(options, nsnull, nsnull); - #else - result = print->PrintPreview(options); + nsresult rv; +@@ -610,6 +613,7 @@ + } + } + } ++#endif + + nsCOMPtr finder (do_GetInterface(mWebBrowser)); + Property changes on: head/www/galeon/files/patch-src_mozilla_GaleonWrapper.cpp ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property