Index: head/x11-fm/nautilus/Makefile
===================================================================
--- head/x11-fm/nautilus/Makefile	(revision 55371)
+++ head/x11-fm/nautilus/Makefile	(revision 55372)
@@ -1,79 +1,79 @@
 # New ports collection makefile for:    nautilus
 # Date created:         		28th August 2000
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nautilus
 PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2 \
 		msgfmt-new:${PORTSDIR}/devel/gettext-devel
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.8:${PORTSDIR}/print/freetype2 \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
 
 .if !defined(WITHOUT_MOZILLA)
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
 .else
 MOZILLA=	mozilla
 .endif
 BUILD_DEPENDS+=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 .endif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
                 XGETTEXT=${LOCALBASE}/bin/xgettext-new
 CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
 .if !defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
 		 --with-mozilla-include-place=${X11BASE}/include/mozilla
 MOZILLA_LIBS=	"-L${X11BASE}/lib/${MOZILLA}"
 PLIST_SUB+=	MOZILLA:=""
 .else
 CONFIGURE_ARGS+= --disable-mozilla-component
 MOZILLA_LIBS=	""
 PLIST_SUB+=	MOZILLA:="@comment "
 .endif
 
 MAN1=		nautilus-xml-migrate.1
 
 .if !defined(WITHOUT_MOZILLA)
 pre-extract:
 .if !defined(WITH_FULL_MOZILLA)
 	@${ECHO_MSG}
 	@${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are"
 	@${ECHO_MSG} " planning to use both Mozilla and Nautilus you can instruct it to use mozilla by"
 	@${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"."
 	@${ECHO_MSG}
 .endif
 	@${ECHO_MSG} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA."
 .endif
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>

Property changes on: head/x11-fm/nautilus/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/x11-fm/nautilus/files/patch-aa
===================================================================
--- head/x11-fm/nautilus/files/patch-aa	(revision 55371)
+++ head/x11-fm/nautilus/files/patch-aa	(revision 55372)
@@ -1,68 +1,76 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Nov 12 14:28:00 2001
-+++ configure	Mon Nov 12 14:34:23 2001
+--- configure.orig	Thu Feb 21 14:19:32 2002
++++ configure	Wed Feb 27 00:22:58 2002
 @@ -7005,7 +7005,7 @@
  
  CC="$_save_cc"
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
  _mozilla_gtk_super_win_libs=
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
  echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
 @@ -7048,7 +7048,7 @@
  fi
  
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtkembedmoz $_mozilla_xpcom_libs"
  _mozilla_gtk_moz_embed_libs=
  echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
  echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
 @@ -7057,7 +7057,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lgtkembedmoz  $LIBS"
 +LIBS="-lgtkembedmoz  -lgtksuperwin $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 7063 "configure"
  #include "confdefs.h"
 @@ -7585,14 +7585,14 @@
     #
     # Check for libiconv
     #
 -   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
 -echo "configure:7590: checking for libiconv_open in -liconv" >&5
 +   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
 +echo "configure:7590: checking for libiconv_open in -lgiconv" >&5
  ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 7598 "configure"
  #include "confdefs.h"
 @@ -7632,7 +7632,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
 -  ICONV_LIBS="-liconv"
 +  ICONV_LIBS="-lgiconv"
  fi
  
  	
 @@ -9141,7 +9141,7 @@
  fi
  
  if test x$SCROLLKEEPER_CONFIG = xno; then
 -  { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
 +  echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
  fi
  
  
+@@ -12061,6 +12061,7 @@
+ s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
+ s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
+ s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
++s%@MOZILLA_LIB_PLACE@%$_mozilla_lib_place%g
+ s%@BUILD_MOZILLA_COMPONENT_TRUE@%$BUILD_MOZILLA_COMPONENT_TRUE%g
+ s%@BUILD_MOZILLA_COMPONENT_FALSE@%$BUILD_MOZILLA_COMPONENT_FALSE%g
+ s%@MOZILLA_PROFILES_CFLAGS@%$MOZILLA_PROFILES_CFLAGS%g

Property changes on: head/x11-fm/nautilus/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property
Index: head/x11-fm/nautilus2/Makefile
===================================================================
--- head/x11-fm/nautilus2/Makefile	(revision 55371)
+++ head/x11-fm/nautilus2/Makefile	(revision 55372)
@@ -1,79 +1,79 @@
 # New ports collection makefile for:    nautilus
 # Date created:         		28th August 2000
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nautilus
 PORTVERSION=	1.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/nautilus
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2 \
 		msgfmt-new:${PORTSDIR}/devel/gettext-devel
 LIB_DEPENDS=	medusa.0:${PORTSDIR}/sysutils/medusa \
 		freetype.8:${PORTSDIR}/print/freetype2 \
 		eel.0:${PORTSDIR}/x11-toolkits/eel
 
 .if !defined(WITHOUT_MOZILLA)
 .if !defined(WITH_FULL_MOZILLA)
 MOZILLA=	mozilla-embedded
 .else
 MOZILLA=	mozilla
 .endif
 BUILD_DEPENDS+=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 .endif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -fno-rtti -fno-exceptions" \
 		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib -lgiconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz ${MOZILLA_LIBS}" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
                 XGETTEXT=${LOCALBASE}/bin/xgettext-new
 CONFIGURE_ARGS=	--with-freetype2-lib-place=${LOCALBASE}/lib \
 		--with-freetype2-include-place=${LOCALBASE}/include/freetype2
 
 .if !defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+= --with-mozilla-lib-place=${X11BASE}/lib/${MOZILLA} \
 		 --with-mozilla-include-place=${X11BASE}/include/mozilla
 MOZILLA_LIBS=	"-L${X11BASE}/lib/${MOZILLA}"
 PLIST_SUB+=	MOZILLA:=""
 .else
 CONFIGURE_ARGS+= --disable-mozilla-component
 MOZILLA_LIBS=	""
 PLIST_SUB+=	MOZILLA:="@comment "
 .endif
 
 MAN1=		nautilus-xml-migrate.1
 
 .if !defined(WITHOUT_MOZILLA)
 pre-extract:
 .if !defined(WITH_FULL_MOZILLA)
 	@${ECHO_MSG}
 	@${ECHO_MSG} " By default the port uses mozilla-embedded for html rendering, but if you are"
 	@${ECHO_MSG} " planning to use both Mozilla and Nautilus you can instruct it to use mozilla by"
 	@${ECHO_MSG} " defining \"WITH_FULL_MOZILLA\"."
 	@${ECHO_MSG}
 .endif
 	@${ECHO_MSG} "You can remove embedded mozilla support by defining WITHOUT_MOZILLA."
 .endif
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>

Property changes on: head/x11-fm/nautilus2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.41
\ No newline at end of property
+1.42
\ No newline at end of property
Index: head/x11-fm/nautilus2/files/patch-aa
===================================================================
--- head/x11-fm/nautilus2/files/patch-aa	(revision 55371)
+++ head/x11-fm/nautilus2/files/patch-aa	(revision 55372)
@@ -1,68 +1,76 @@
 
 $FreeBSD$
 
---- configure.orig	Mon Nov 12 14:28:00 2001
-+++ configure	Mon Nov 12 14:34:23 2001
+--- configure.orig	Thu Feb 21 14:19:32 2002
++++ configure	Wed Feb 27 00:22:58 2002
 @@ -7005,7 +7005,7 @@
  
  CC="$_save_cc"
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
  _mozilla_gtk_super_win_libs=
  echo $ac_n "checking for gdk_superwin_get_type in -lgtksuperwin""... $ac_c" 1>&6
  echo "configure:7012: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
 @@ -7048,7 +7048,7 @@
  fi
  
  
 -LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz $_mozilla_xpcom_libs"
 +LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtkembedmoz $_mozilla_xpcom_libs"
  _mozilla_gtk_moz_embed_libs=
  echo $ac_n "checking for gtk_moz_embed_get_type in -lgtkembedmoz""... $ac_c" 1>&6
  echo "configure:7055: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
 @@ -7057,7 +7057,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lgtkembedmoz  $LIBS"
 +LIBS="-lgtkembedmoz  -lgtksuperwin $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 7063 "configure"
  #include "confdefs.h"
 @@ -7585,14 +7585,14 @@
     #
     # Check for libiconv
     #
 -   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
 -echo "configure:7590: checking for libiconv_open in -liconv" >&5
 +   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
 +echo "configure:7590: checking for libiconv_open in -lgiconv" >&5
  ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 7598 "configure"
  #include "confdefs.h"
 @@ -7632,7 +7632,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
 -  ICONV_LIBS="-liconv"
 +  ICONV_LIBS="-lgiconv"
  fi
  
  	
 @@ -9141,7 +9141,7 @@
  fi
  
  if test x$SCROLLKEEPER_CONFIG = xno; then
 -  { echo "configure: error: Couldn't find scrollkeeper-config" 1>&2; exit 1; }
 +  echo "configure: warning: Couldn't find scrollkeeper-config" 1>&2
  fi
  
  
+@@ -12061,6 +12061,7 @@
+ s%@MOZILLA_COMPONENT_RPATH_FLAGS@%$MOZILLA_COMPONENT_RPATH_FLAGS%g
+ s%@MOZILLA_COMPONENT_LDFLAGS@%$MOZILLA_COMPONENT_LDFLAGS%g
+ s%@MOZILLA_COMPONENT_LIBS@%$MOZILLA_COMPONENT_LIBS%g
++s%@MOZILLA_LIB_PLACE@%$_mozilla_lib_place%g
+ s%@BUILD_MOZILLA_COMPONENT_TRUE@%$BUILD_MOZILLA_COMPONENT_TRUE%g
+ s%@BUILD_MOZILLA_COMPONENT_FALSE@%$BUILD_MOZILLA_COMPONENT_FALSE%g
+ s%@MOZILLA_PROFILES_CFLAGS@%$MOZILLA_PROFILES_CFLAGS%g

Property changes on: head/x11-fm/nautilus2/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.8
\ No newline at end of property
+1.9
\ No newline at end of property