head	1.22;
access;
symbols
	RELEASE_6_1_0:1.20
	RELEASE_5_5_0:1.20
	RELEASE_6_0_0:1.20
	RELEASE_5_4_0:1.20
	RELEASE_4_11_0:1.19
	RELEASE_5_3_0:1.19
	RELEASE_4_10_0:1.19
	RELEASE_5_2_1:1.18
	RELEASE_5_2_0:1.18
	RELEASE_4_9_0:1.18
	RELEASE_5_1_0:1.17
	RELEASE_4_8_0:1.17
	RELEASE_5_0_0:1.16
	RELEASE_4_7_0:1.16
	RELEASE_4_6_2:1.12
	RELEASE_4_6_1:1.12
	RELEASE_4_6_0:1.12
	old_RELEASE_5_0_DP1:1.10
	old_RELEASE_4_5_0:1.8
	old_RELEASE_4_4_0:1.6
	old_RELEASE_4_3_0:1.3
	old_RELEASE_4_2_0:1.1
	old_RELEASE_4_1_1:1.1;
locks; strict;
comment	@# @;


1.22
date	2006.05.29.05.32.30;	author mezz;	state dead;
branches;
next	1.21;

1.21
date	2006.04.30.00.47.11;	author marcus;	state Exp;
branches;
next	1.20;

1.20
date	2005.03.12.10.39.35;	author marcus;	state Exp;
branches;
next	1.19;

1.19
date	2004.04.05.03.11.36;	author marcus;	state Exp;
branches;
next	1.18;

1.18
date	2003.09.18.06.49.35;	author marcus;	state Exp;
branches;
next	1.17;

1.17
date	2003.02.07.18.42.18;	author marcus;	state Exp;
branches;
next	1.16;

1.16
date	2002.07.24.04.52.36;	author marcus;	state Exp;
branches;
next	1.15;

1.15
date	2002.06.15.09.05.11;	author marcus;	state Exp;
branches;
next	1.14;

1.14
date	2002.06.12.00.18.19;	author marcus;	state Exp;
branches;
next	1.13;

1.13
date	2002.05.28.16.08.25;	author marcus;	state Exp;
branches;
next	1.12;

1.12
date	2002.05.20.18.03.39;	author sobomax;	state Exp;
branches;
next	1.11;

1.11
date	2002.04.26.05.58.40;	author sobomax;	state Exp;
branches;
next	1.10;

1.10
date	2002.03.19.12.52.49;	author sobomax;	state Exp;
branches;
next	1.9;

1.9
date	2002.03.01.16.22.38;	author sobomax;	state Exp;
branches;
next	1.8;

1.8
date	2001.11.12.13.19.39;	author sobomax;	state Exp;
branches;
next	1.7;

1.7
date	2001.10.30.08.12.35;	author sobomax;	state Exp;
branches;
next	1.6;

1.6
date	2001.05.22.13.41.10;	author sobomax;	state Exp;
branches;
next	1.5;

1.5
date	2001.05.14.17.18.52;	author sobomax;	state Exp;
branches;
next	1.4;

1.4
date	2001.05.04.21.51.15;	author ade;	state Exp;
branches;
next	1.3;

1.3
date	2001.02.01.20.16.40;	author sobomax;	state Exp;
branches;
next	1.2;

1.2
date	2001.01.12.19.59.39;	author ade;	state Exp;
branches;
next	1.1;

1.1
date	2000.09.14.17.57.57;	author ade;	state Exp;
branches;
next	;


desc
@@


1.22
log
@x11-fm/nautilus2 -> x11-fm/nautilus

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for other ports, chase the rename.
@
text
@--- configure.orig	Mon Apr 10 20:37:17 2006
+++ configure	Mon Apr 10 20:38:17 2006
@@@@ -25674,7 +25674,7 @@@@
 
 CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
 
-CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
 
 
 DISABLE_DEPRECATED_CFLAGS=""
@@@@ -26832,7 +26832,7 @@@@
 s,@@STARTUP_NOTIFICATION_PACKAGE@@,$STARTUP_NOTIFICATION_PACKAGE,;t t
 s,@@ac_pt_PKG_CONFIG@@,$ac_pt_PKG_CONFIG,;t t
 s,@@ALL_CFLAGS@@,$ALL_CFLAGS,;t t
-s,@@ALL_LIBS@@,$ALL_LIBS,;t t
+s~@@ALL_LIBS@@~$ALL_LIBS~;t t
 s,@@CONFIG_STATUS_DEPENDENCIES@@,$CONFIG_STATUS_DEPENDENCIES,;t t
 s,@@GETTEXT_PACKAGE@@,$GETTEXT_PACKAGE,;t t
 s,@@USE_NLS@@,$USE_NLS,;t t
@


1.21
log
@Presenting GNOME 2.14.1 for FreeBSD!  Checkout
http://www.gnome.org/start/2.14/ for the official release notes, and a list
of all the gooides in this new release.  In particular, GNOME 2.14 focused
on performance, and they did not miss the mark.  There's some new eye candy,
but most of the big things are waiting until GNOME 2.16.  On the FreeBSD
side, we tried to clean up all the crashers we could.  In particular, we
really improved GNOME's 64-bit support.

The good news is that this release does not bring any big shared library
version bumps, so you can almost do a simple portupgrade to get to 2.14.
There are a few minor gotchas that will be documented in UPDATING shortly.

The FreeBSD GNOME Team would like th thank the following users for their
patches, feedback, and sometimes incessant complaing about crashes (you
know who you are).

Yasuda Keisuke <kysd@@po.harenet.ne.jp>
Pascal Hofstee <caelian@@gmail.com>
rmgls@@wanadoo.fr
tmclaugh
Yuri Pankov <yuri.pankov@@gmail.com>
sajd on #freebsd-gnome
ade
ankon on #FreeBSD-Gnome
mux
Pascal Hofstee <caelian@@gmail.com>
QuiRK on #freebsd-gnome
Vladimir Timofeev <vovkasm@@gmail.com>
@
text
@@


1.20
log
@Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!
@
text
@d1 3
a3 3
--- configure.orig	Mon Nov 10 22:08:05 2003
+++ configure	Mon Nov 10 22:08:05 2003
@@@@ -12979,7 +12979,7 @@@@
d11 2
a12 3
 COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
@@@@ -13959,7 +13959,7 @@@@
 s,@@PKG_CONFIG@@,$PKG_CONFIG,;t t
d14 1
d18 1
a20 1
 s,@@MSGFMT@@,$MSGFMT,;t t
@


1.19
log
@Presenting GNOME 2.6.0.  The FreeBSD GNOME Team feels this our best release
ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@@cox.net>
Khairil Yusof <kaeru@@pd.jaring.my>
Koop Mast <kwm@@rainbow-runner.nl>
Simon Barner <barner@@in.tum.de>
Tom McLaughlin <tmclaugh@@sdf.lonestar.org>
Scott Dodson <sdodson@@sdodson.com>
Vladimir Grebenschikov <vova@@sw.ru>
@
text
@a2 9
@@@@ -12971,7 +12971,7 @@@@
 
 LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
 
-LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
+LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
 
 
 CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
@


1.18
log
@Update to GNOME 2.4.0.  For all the goodies on what's changed, known issues,
future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@@chello.nl>
Akifyev Sergey <asa@@gascom.ru>
Franz Klammer <klammer@@webonaut.com>
yvind Kolbu <oyvind@@kebab.gaffel.nu>
Thomas E. Zander <riggs@@rrr.de>
Jeremy Messenger <mezz7@@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users
@
text
@d1 3
a3 3
--- configure.orig	Sat Jun 28 00:42:27 2003
+++ configure	Sat Jun 28 00:44:45 2003
@@@@ -12860,7 +12860,7 @@@@
d12 1
a12 1
@@@@ -12868,7 +12868,7 @@@@
d21 1
a21 1
@@@@ -13849,7 +13849,7 @@@@
a29 32
@@@@ -13901,26 +13901,26 @@@@
 s,@@HAVE_JW_FALSE@@,$HAVE_JW_FALSE,;t t
 s,@@HAVE_JW@@,$HAVE_JW,;t t
 s,@@MEDUSA_CFLAGS@@,$MEDUSA_CFLAGS,;t t
-s,@@MEDUSA_LIBS@@,$MEDUSA_LIBS,;t t
+s~@@MEDUSA_LIBS@@~$MEDUSA_LIBS~;t t
 s,@@LIBJPEG@@,$LIBJPEG,;t t
 s,@@GIMPHWRAPBOX_CFLAGS@@,$GIMPHWRAPBOX_CFLAGS,;t t
 s,@@GSEQUENCE_CFLAGS@@,$GSEQUENCE_CFLAGS,;t t
 s,@@LIBEGG_CFLAGS@@,$LIBEGG_CFLAGS,;t t
 s,@@LIBNAUTILUS_CFLAGS@@,$LIBNAUTILUS_CFLAGS,;t t
-s,@@LIBNAUTILUS_LIBS@@,$LIBNAUTILUS_LIBS,;t t
+s~@@LIBNAUTILUS_LIBS@@~$LIBNAUTILUS_LIBS~;t t
 s,@@LIBNAUTILUS_IDL_INCLUDES@@,$LIBNAUTILUS_IDL_INCLUDES,;t t
 s,@@CORE_CFLAGS@@,$CORE_CFLAGS,;t t
-s,@@CORE_LIBS@@,$CORE_LIBS,;t t
+s~@@CORE_LIBS@@~$CORE_LIBS~;t t
 s,@@CORE_IDL_INCLUDES@@,$CORE_IDL_INCLUDES,;t t
 s,@@COMPONENT_CFLAGS@@,$COMPONENT_CFLAGS,;t t
-s,@@COMPONENT_LIBS@@,$COMPONENT_LIBS,;t t
+s~@@COMPONENT_LIBS@@~$COMPONENT_LIBS~;t t
 s,@@EMBLEM_COMPONENT_CFLAGS@@,$EMBLEM_COMPONENT_CFLAGS,;t t
 s,@@EMBLEM_COMPONENT_LIBS@@,$EMBLEM_COMPONENT_LIBS,;t t
 s,@@DISABLE_DEPRECATED_CFLAGS@@,$DISABLE_DEPRECATED_CFLAGS,;t t
 s,@@ENABLE_HARDWARE_VIEW_TRUE@@,$ENABLE_HARDWARE_VIEW_TRUE,;t t
 s,@@ENABLE_HARDWARE_VIEW_FALSE@@,$ENABLE_HARDWARE_VIEW_FALSE,;t t
 s,@@CAPPLET_CFLAGS@@,$CAPPLET_CFLAGS,;t t
-s,@@CAPPLET_LIBS@@,$CAPPLET_LIBS,;t t
+s~@@CAPPLET_LIBS@@~$CAPPLET_LIBS~;t t
 s,@@GCONFTOOL@@,$GCONFTOOL,;t t
 s,@@GCONF_SCHEMA_CONFIG_SOURCE@@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
 s,@@GCONF_SCHEMA_FILE_DIR@@,$GCONF_SCHEMA_FILE_DIR,;t t
@


1.17
log
@Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.
@
text
@d1 3
a3 11
--- configure.orig	Mon Jan 13 10:45:25 2003
+++ configure	Tue Jan 14 13:11:53 2003
@@@@ -8294,6 +8294,7 @@@@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@@@ -12661,7 +12662,7 @@@@
d12 1
a12 1
@@@@ -12669,7 +12670,7 @@@@
d21 1
a21 2
@@@@ -13593,7 +13594,7 @@@@
 s,@@LIBTOOL@@,$LIBTOOL,;t t
d23 1
a27 1
 s,@@ALLOCA@@,$ALLOCA,;t t
d29 2
a30 1
@@@@ -13643,25 +13644,25 @@@@
d38 1
@


1.16
log
@Update to 2.0.1.
@
text
@d1 3
a3 3
--- configure.orig	Tue Jul 23 21:46:17 2002
+++ configure	Tue Jul 23 21:49:20 2002
@@@@ -8311,6 +8311,7 @@@@
d11 1
a11 1
@@@@ -13383,7 +13384,7 @@@@
d20 1
a20 1
@@@@ -13391,7 +13392,7 @@@@
d29 3
a31 6
@@@@ -14291,9 +14292,9 @@@@
 s,@@ORBIT_CONFIG@@,$ORBIT_CONFIG,;t t
 s,@@ORBIT_IDL@@,$ORBIT_IDL,;t t
 s,@@ORBIT_CFLAGS@@,$ORBIT_CFLAGS,;t t
-s,@@ORBIT_LIBS@@,$ORBIT_LIBS,;t t
+s~@@ORBIT_LIBS@@~$ORBIT_LIBS~;t t
d38 1
a38 1
@@@@ -14345,24 +14346,24 @@@@
d46 1
d58 2
a59 3
 s,@@MUSIC_COMPONENT_CFLAGS@@,$MUSIC_COMPONENT_CFLAGS,;t t
-s,@@MUSIC_COMPONENT_LIBS@@,$MUSIC_COMPONENT_LIBS,;t t
+s~@@MUSIC_COMPONENT_LIBS@@~$MUSIC_COMPONENT_LIBS~;t t
@


1.15
log
@Update to GNOME 2.0 Release Candidate 1...the "Fever Pitch" release.
@
text
@d1 3
a3 3
--- configure.orig	Sat Jun 15 02:24:38 2002
+++ configure	Sat Jun 15 02:27:06 2002
@@@@ -7481,6 +7481,7 @@@@
d11 1
a11 1
@@@@ -11829,14 +11830,14 @@@@
d18 1
d20 1
a20 1
 CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
d27 3
a29 3
 COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0"
 COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
@@@@ -12546,9 +12547,9 @@@@
d41 1
a41 1
@@@@ -12599,24 +12600,24 @@@@
@


1.14
log
@Update to the latest GNOME 2 snapshot.
@
text
@d1 3
a3 3
--- configure.orig	Tue Jun 11 17:44:27 2002
+++ configure	Tue Jun 11 17:46:59 2002
@@@@ -7480,6 +7480,7 @@@@
d11 1
a11 1
@@@@ -11770,14 +11771,14 @@@@
d28 1
a28 1
@@@@ -12469,9 +12470,9 @@@@
d40 1
a40 1
@@@@ -12522,22 +12523,22 @@@@
d63 2
@


1.13
log
@Update to the latest GNOME 2.0 snapshot, the "Stay on target!" release.
@
text
@d1 3
a3 3
--- configure.orig	Tue May 28 00:57:18 2002
+++ configure	Tue May 28 01:00:25 2002
@@@@ -7495,6 +7495,7 @@@@
d11 1
a11 1
@@@@ -12398,14 +12399,14 @@@@
d21 1
a21 1
 CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_LIBS $LIBJPEG $x_libs"
d28 1
a28 1
@@@@ -13114,9 +13115,9 @@@@
d40 1
a40 1
@@@@ -13171,22 +13172,22 @@@@
@


1.12
log
@Update nautilus2 to 1.1.16 after a repo-copy from ports/x11-fm/nautilus and
connect it to the build.
@
text
@d1 3
a3 6

$FreeBSD$

--- configure.orig	Fri May 17 18:08:30 2002
+++ configure	Fri May 17 18:09:02 2002
@@@@ -7480,6 +7480,7 @@@@
d11 1
a11 1
@@@@ -12030,14 +12031,14 @@@@
d28 1
a28 1
@@@@ -12746,9 +12747,9 @@@@
d40 1
a40 1
@@@@ -12799,23 +12800,23 @@@@
a45 1
 s,@@LIBPNG@@,$LIBPNG,;t t
@


1.11
log
@Put USE_LIBTOOL back.
@
text
@d4 3
a6 3
--- configure.orig	Thu Apr 25 22:34:32 2002
+++ configure	Thu Apr 25 22:35:04 2002
@@@@ -5335,6 +5335,7 @@@@
d14 1
a14 1
@@@@ -7005,7 +7006,7 @@@@
d16 1
a16 1
 CC="$_save_cc"
d18 55
a72 40
-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 +7049,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 +7058,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"
@@@@ -9141,7 +9142,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 +12062,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
@


1.10
log
@Fix another few places where giconv used instead of iconv.

PR:		36059, 36063, 36082
Submitted by:	Joe Marcus Clarke <marcus@@marcuscom.com>
@
text
@d2 1
a2 1
$FreeBSD: ports/x11-fm/nautilus/files/patch-aa,v 1.9 2002/03/01 16:22:38 sobomax Exp $
d4 11
a14 3
--- configure.orig	Thu Feb 21 14:19:32 2002
+++ configure	Wed Feb 27 00:22:58 2002
@@@@ -7005,7 +7005,7 @@@@
d23 1
a23 1
@@@@ -7048,7 +7048,7 @@@@
d32 1
a32 1
@@@@ -7057,7 +7057,7 @@@@
d41 1
a41 1
@@@@ -9141,7 +9141,7 @@@@
d50 1
a50 1
@@@@ -12061,6 +12061,7 @@@@
@


1.9
log
@Add patch missed in the previous commit.

Submitted by:	Joe Marcus Clarke <marcus@@marcuscom.com>
@
text
@d2 1
a2 1
$FreeBSD$
a32 27
@@@@ -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
 
 	
@


1.8
log
@Update to 1.0.6.
@
text
@d4 2
a5 2
--- configure.orig	Mon Nov 12 14:28:00 2001
+++ configure	Mon Nov 12 14:34:23 2001
d69 8
@


1.7
log
@Update to 1.0.5. With an updated ORBit it works in 5-CURRENT and 4-STABLE
systems. Some functionality is still missed, though (e.g. Mozilla component
doesn't work), but it is a good start.
@
text
@d4 3
a6 3
--- configure.orig	Thu Oct 25 18:17:31 2001
+++ configure	Thu Oct 25 18:18:56 2001
@@@@ -7003,7 +7003,7 @@@@
d14 2
a15 2
 echo "configure:7010: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
@@@@ -7046,7 +7046,7 @@@@
d23 2
a24 2
 echo "configure:7053: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
@@@@ -7055,7 +7055,7 @@@@
d31 1
a31 1
 #line 7061 "configure"
d33 28
a60 1
@@@@ -9018,7 +9018,7 @@@@
@


1.6
log
@Put back Mozilla support.
@
text
@d4 3
a6 3
--- configure.orig	Tue May 22 15:47:27 2001
+++ configure	Tue May 22 15:55:11 2001
@@@@ -3433,7 +3433,7 @@@@
d12 1
d14 2
a15 3
 echo "configure:3439: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
 ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
@@@@ -3475,7 +3475,7 @@@@
d20 2
a21 1
+LDFLAGS="$_save_ldflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtkembedmoz -lgtksuperwin $_mozilla_xpcom_libs"
d23 2
a24 3
 echo "configure:3481: checking for gtk_moz_embed_get_type in -lgtkembedmoz" >&5
 ac_lib_var=`echo gtkembedmoz'_'gtk_moz_embed_get_type | sed 'y%./+-%__p_%'`
@@@@ -3483,7 +3483,7 @@@@
d31 1
a31 1
 #line 3489 "configure"
d33 1
a33 1
@@@@ -5472,7 +5472,7 @@@@
@


1.5
log
@Update to 1.0.3.
@
text
@d4 2
a5 2
--- configure.orig	Mon May 14 16:42:41 2001
+++ configure	Mon May 14 16:42:42 2001
d15 18
@


1.4
log
@The new GNOME 1.4 "Fifth-Toe" metaport, bringing together a whole
bunch of GNOME applications under one convenient building mechanism.

Applications include:

mozilla, galeon, gabber, pan, gnumeric, sodipodi, atomix, balsa,
bombermaze, dia, eog, gedit, gimp, glimmer, gnomeicu, gob, gtm,
gnucash and abiword.
@
text
@d1 8
a8 44
--- configure.orig	Mon Mar 12 19:48:16 2001
+++ configure	Fri Mar 16 15:02:38 2001
@@@@ -45,5 +45,5 @@@@
 ac_help="$ac_help
-  --with-freetype2-libraries=PATH		freetype2 library path"
+  --with-freetype2-lib-place=PREFIX		freetype2 library path"
 ac_help="$ac_help
-  --with-freetype2-includes=PATH	freetype2 include path"
+  --with-freetype2-include-place=PREFIX	freetype2 include path"
 ac_help="$ac_help
@@@@ -3216,4 +3216,4 @@@@
 # Check whether --with-freetype2-libraries or --without-freetype2-libraries was given.
-if test "${with_freetype2_libraries+set}" = set; then
-  withval="$with_freetype2_libraries"
+if test "${with_freetype2_lib_place+set}" = set; then
+  withval="$with_freetype2_lib_place"
   freetype2_lib_prefix=$withval
@@@@ -3223,4 +3223,4 @@@@
 # Check whether --with-freetype2-includes or --without-freetype2-includes was given.
-if test "${with_freetype2_includes+set}" = set; then
-  withval="$with_freetype2_includes"
+if test "${with_freetype2_include_place+set}" = set; then
+  withval="$with_freetype2_include_place"
   freetype2_include_prefix=$withval
@@@@ -3354,3 +3354,3 @@@@
   ac_save_LIBS="$LIBS"
-LIBS="-lpam -ldl $LIBS"
+LIBS="-lpam $LIBS"
 cat > conftest.$ac_ext <<EOF
@@@@ -3394,3 +3394,3 @@@@
   ac_save_LIBS="$LIBS"
-LIBS="-lpam_misc -ldl -lpam $LIBS"
+LIBS="-lpam_misc -lpam $LIBS"
 cat > conftest.$ac_ext <<EOF
@@@@ -3422,6 +3422,6 @@@@
   echo "$ac_t""yes" 1>&6
-  PAM_LIBS="-ldl -lpam -lpam_misc"
+  PAM_LIBS="-lpam -lpam_misc"
 else
   echo "$ac_t""no" 1>&6
-PAM_LIBS="-ldl -lpam"
+PAM_LIBS="-lpam"
 fi
@@@@ -3662,3 +3662,3 @@@@
d13 5
a17 1
@@@@ -6117,3 +6117,3 @@@@
d22 2
@


1.3
log
@Update to 0.8. Unfortunately it doesn't work apart from setup wizard, so
use it cautiously and don't forget to let me know if you managed to fix it.
@
text
@d1 3
a3 8

$FreeBSD$

--- configure.orig	Wed Jan 31 17:42:11 2001
+++ configure	Wed Jan 31 17:52:50 2001
@@@@ -41,9 +41,9 @@@@
 ac_help="$ac_help
   --enable-eazel-services	Enable support for Eazel services (default is no)"
d11 1
a11 5
   --with-freetype2-prefix=PATH		freetype2 installation prefix"
 ac_help="$ac_help
@@@@ -2789,15 +2789,15 @@@@
 _found_freetype2="no"
 
d18 1
a18 3
 fi
 
 
d25 1
a25 5
 fi
 
@@@@ -2927,7 +2927,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
d30 1
a30 5
 #line 2933 "configure"
 #include "confdefs.h"
@@@@ -2967,7 +2967,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
d35 1
a35 5
 #line 2973 "configure"
 #include "confdefs.h"
@@@@ -2995,10 +2995,10 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
d44 1
a44 5
  
 else
@@@@ -3235,7 +3235,7 @@@@
 
 CC="$_save_cc"
d49 4
a52 10
 echo "configure:3241: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
 ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
@@@@ -3598,7 +3598,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  rpm_libs=-lbz2
+  rpm_libs="-lrpm -lbz2"
 else
   echo "$ac_t""no" 1>&6
@


1.2
log
@Long-awaited update to 0.5 -- goes "bang" fairly quickly, spewing corefiles
all over the place.  If some enterprising hacker wants to figure out why,
patches are more than welcome, both to me and the nautilus developers.
@
text
@d1 6
a6 3
--- configure.orig	Tue Nov  7 08:28:46 2000
+++ configure	Fri Jan 12 10:20:32 2001
@@@@ -39,5 +39,5 @@@@
d8 3
a10 1
-  --with-freetype2-lib-prefix=PREFIX		freetype2 library path"
d13 1
a13 1
-  --with-freetype2-include-prefix=PREFIX	freetype2 include path"
d16 4
a19 1
@@@@ -2545,5 +2545,4 @@@@
d21 3
a23 3
-# Check whether --with-freetype2 or --without-freetype2 was given.
-if test "${with_freetype2+set}" = set; then
-  withval="$with_freetype2"
d27 2
a28 1
@@@@ -2553,6 +2552,4 @@@@
d30 3
a32 4
-
-# Check whether --with-freetype2 or --without-freetype2 was given.
-if test "${with_freetype2+set}" = set; then
-  withval="$with_freetype2"
d36 5
a40 1
@@@@ -2670,3 +2667,3 @@@@
d45 5
a49 1
@@@@ -2710,3 +2707,3 @@@@
d54 5
a58 1
@@@@ -2738,6 +2735,6 @@@@
d67 5
a71 1
@@@@ -2978,3 +2975,3 @@@@
d76 5
a80 1
@@@@ -3337,3 +3334,3 @@@@
d85 2
@


1.1
log
@Add nautilus, the file manager and graphical shell being
developed for GNOME 2.0

Please note:  as it stands, this port compiles and installs
cleanly, but immediately coredumps if you try to run it.
I've only committed what I have so far so that any enterprising
souls can try and figure out what on earth is going wrong.

Bug report 3075 has been filed with bugzilla.eazel.com
@
text
@d1 28
a28 5
--- configure.orig	Mon Aug 14 19:47:02 2000
+++ configure	Mon Aug 28 13:34:38 2000
@@@@ -2368,7 +2368,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
d31 1
a31 1
+LIBS="-lpam  $LIBS"
d33 1
a33 5
 #line 2374 "configure"
 #include "confdefs.h"
@@@@ -2408,7 +2408,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
d38 1
a38 5
 #line 2414 "configure"
 #include "confdefs.h"
@@@@ -2436,10 +2436,10 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
d47 1
a47 5
  
 else
@@@@ -2657,7 +2657,7 @@@@
 
 CC=$_save_cc
d49 2
a50 2
-LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lgtksuperwin"
+LDFLAGS="$_save_cflags -L$_mozilla_lib_place $_mozilla_all_nspr_flags -lstdc++ -lgtksuperwin"
d52 1
a52 5
 echo "configure:2663: checking for gdk_superwin_get_type in -lgtksuperwin" >&5
 ac_lib_var=`echo gtksuperwin'_'gdk_superwin_get_type | sed 'y%./+-%__p_%'`
@@@@ -2979,7 +2979,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
a56 51
   echo "$ac_t""no" 1>&6
 fi
@@@@ -3019,7 +3019,7 @@@@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  rpm_libs=-lbz2
+  rpm_libs="-lrpm -lbz2"
 			cat >> confdefs.h <<\EOF
 #define bzread BZ2_bzread
 EOF
@@@@ -3109,24 +3109,24 @@@@
   echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for rpmRunTransactions in -lrpm""... $ac_c" 1>&6
-echo "configure:3114: checking for rpmRunTransactions in -lrpm" >&5
-ac_lib_var=`echo rpm'_'rpmRunTransactions | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for rpmReadPackageInfo in -lrpm""... $ac_c" 1>&6
+echo "configure:3114: checking for rpmReadPackageInfo in -lrpm" >&5
+ac_lib_var=`echo rpm'_'rpmReadPackageInfo | 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="-lrpm -lz $rpm_libs -ldb $LIBS"
+LIBS="-lrpm -lz $rpm_libs $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3122 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char rpmRunTransactions();
+char rpmReadPackageInfo();
 
 int main() {
-rpmRunTransactions()
+rpmReadPackageInfo()
 ; return 0; }
 EOF
 if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@@@ -3156,7 +3156,7 @@@@
 #define HAVE_RPM 1
 EOF
 
-  RPM_LIBS="-lrpm -lz $rpm_libs -ldb"
+  RPM_LIBS="-lrpm -lz $rpm_libs"
 fi
 
 
@

