Use new gtk port and set USE_LIBTOOL=yes.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 97 insertions, 140 deletions

diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile
index 467ee5198b6e..f75c53c3b1a8 100644
--- a/x11/gnomecore/Makefile
+++ b/x11/gnomecore/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 March 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.22 1999/04/02 03:25:23 steve Exp $
+# $Id: Makefile,v 1.23 1999/05/09 17:04:51 steve Exp $
 #
 
 DISTNAME=	gnome-core-1.0.5
@@ -16,22 +16,19 @@ MAINTAINER=	nacai@iname.com
 
 RUN_DEPENDS=	${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio
 LIB_DEPENDS=	gtop.1:${PORTSDIR}/devel/libgtop \
+		gnomeprint.0:${PORTSDIR}/print/gnomeprint \
 		ghttp.1:${PORTSDIR}/www/libghttp
 
-# implicit dependencies
-# gettext, esound, gnomelibs
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
-
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+		--with-gnome=${PREFIX}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa
index f3d5a45f400e..6fc92a3d6671 100644
--- a/x11/gnomecore/files/patch-aa
+++ b/x11/gnomecore/files/patch-aa
@@ -1,15 +1,15 @@
---- configure.orig	Sat Mar 13 17:32:41 1999
-+++ configure	Wed Mar 24 20:02:38 1999
-@@ -2578,7 +2578,7 @@
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
- DLLTOOL="$DLLTOOL" AS="$AS" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-+${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
-@@ -5096,7 +5096,7 @@
+--- configure.orig	Fri Apr  9 18:03:33 1999
++++ configure	Sat May 22 21:21:21 1999
+@@ -3122,7 +3122,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -5098,7 +5098,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -18,16 +18,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -5358,7 +5358,7 @@
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=share
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-@@ -6267,6 +6267,7 @@
+@@ -6269,6 +6269,7 @@
  case "$host" in
  *linux*) CDROM_HOST=linux;;
  *solaris*) CDROM_HOST=solaris;;
diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab
index e653f9dab124..abaa03ca82de 100644
--- a/x11/gnomecore/files/patch-ab
+++ b/x11/gnomecore/files/patch-ab
@@ -1,14 +1,3 @@
---- help-browser/gnome-info2html/utils.c.orig	Tue Dec 29 05:18:57 1998
-+++ help-browser/gnome-info2html/utils.c	Tue Dec 29 05:19:04 1998
-@@ -3,7 +3,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <sys/types.h>
--#include <regex.h>
-+#include <gnuregex.h>
- 
- #include <glib.h>
- 
 --- help-browser/gnome-help-browser.c.orig	Tue Dec 29 05:19:41 1998
 +++ help-browser/gnome-help-browser.c	Tue Dec 29 05:20:50 1998
 @@ -72,13 +72,10 @@
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index 84697b02acf0..7d2ee4a51e0f 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -5,7 +5,7 @@
  l = @l@
  
 -always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 drivemount clockmail fifteen life battery charpick 	 gnome-pager mini-commander gkb jbc another_clock
-+always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 clockmail fifteen life battery charpick 	 gnome-pager mini-commander gkb jbc another_clock
++always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	clockmail fifteen life battery charpick 	 gnome-pager mini-commander gkb jbc another_clock
  
  @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
  @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = 
@@ -372,13 +372,14 @@
  util_DATA = gnome-terminal.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
---- gsm/Makefile.in.orig	Tue Mar  2 01:52:17 1999
-+++ gsm/Makefile.in	Sat Mar  6 17:59:42 1999
+--- gsm/Makefile.in.orig	Sat Mar 27 00:09:08 1999
++++ gsm/Makefile.in	Wed Apr  7 19:01:24 1999
 @@ -154,9 +154,9 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
-
- defaultdir = $(datadir)/gnome
+ 
+-defaultdir = $(datadir)/gnome
++defaultdir = $(datadir)
  
 -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-DGNOMELOCALEDIR=\""$(datadir)/locale\"" 	-DDEFAULTDIR="\"$(defaultdir)\""
 +INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/intl -I$(top_builddir)/intl		-DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" 	-DDEFAULTDIR="\"$(datadir)\""
@@ -460,6 +461,17 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- help-browser/help/ko/Makefile.in.orig	Tue Mar  2 01:52:46 1999
++++ help-browser/help/ko/Makefile.in	Sat Mar  6 17:59:42 1999
+@@ -157,7 +157,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html 
+ 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko
++help_browser_helpdir = $(datadir)/help/help-browser/ko
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
 --- help-browser/help/no/Makefile.in.orig	Tue Mar  2 01:52:47 1999
 +++ help-browser/help/no/Makefile.in	Sat Mar  6 17:59:42 1999
 @@ -157,7 +157,7 @@
diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist
index 696ee859515d..80f56b654481 100644
--- a/x11/gnomecore/pkg-plist
+++ b/x11/gnomecore/pkg-plist
@@ -60,13 +60,13 @@ include/applet-widget.h
 include/gnome-panel.h
 include/panel-types.h
 lib/libfish_applet.a
-lib/libfish_applet.la
+lib/libfish_applet.so
 lib/libfish_applet.so.0
 lib/libgkb_applet.a
-lib/libgkb_applet.la
+lib/libgkb_applet.so
 lib/libgkb_applet.so.0
 lib/libpanel_applet.a
-lib/libpanel_applet.la
+lib/libpanel_applet.so
 lib/libpanel_applet.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
@@ -196,11 +196,8 @@ share/gnome/asclock/shaped/minute.xpm
 share/gnome/asclock/shaped/month.xpm
 share/gnome/asclock/shaped/second.xpm
 share/gnome/asclock/shaped/weekday.xpm
-share/gnome/gnome/default.session
-share/gnome/gnome/default.wm
-share/gnome/gnome/help/help-browser/ko/default-page.html
-share/gnome/gnome/help/help-browser/ko/help-browser.html
-share/gnome/gnome/help/help-browser/ko/topic.dat
+share/gnome/default.session
+share/gnome/default.wm
 share/gnome/help/gnome-intro/C/a-sample-session.html
 share/gnome/help/gnome-intro/C/a-sample-session75.html
 share/gnome/help/gnome-intro/C/c93.html
@@ -252,22 +249,32 @@ share/gnome/help/gnome-intro/C/topic.dat
 share/gnome/help/help-browser/C/default-page.html
 share/gnome/help/help-browser/C/gnome-logo-large.png
 share/gnome/help/help-browser/C/help-browser.html
+share/gnome/help/help-browser/C/index.html
 share/gnome/help/help-browser/C/topic.dat
 share/gnome/help/help-browser/es/default-page.html
 share/gnome/help/help-browser/es/help-browser.html
+share/gnome/help/help-browser/es/index.html
 share/gnome/help/help-browser/es/topic.dat
 share/gnome/help/help-browser/fr/default-page.html
 share/gnome/help/help-browser/fr/help-browser.html
+share/gnome/help/help-browser/fr/index.html
 share/gnome/help/help-browser/fr/topic.dat
 share/gnome/help/help-browser/hu/default-page.html
 share/gnome/help/help-browser/hu/gnome-logo-large.png
 share/gnome/help/help-browser/hu/help-browser.html
+share/gnome/help/help-browser/hu/index.html
 share/gnome/help/help-browser/hu/topic.dat
 share/gnome/help/help-browser/it/default-page.html
 share/gnome/help/help-browser/it/help-browser.html
+share/gnome/help/help-browser/it/index.html
 share/gnome/help/help-browser/it/topic.dat
+share/gnome/help/help-browser/ko/default-page.html
+share/gnome/help/help-browser/ko/help-browser.html
+share/gnome/help/help-browser/ko/index.html
+share/gnome/help/help-browser/ko/topic.dat
 share/gnome/help/help-browser/no/default-page.html
 share/gnome/help/help-browser/no/help-browser.html
+share/gnome/help/help-browser/no/index.html
 share/gnome/help/help-browser/no/topic.dat
 share/gnome/help/mini-commander_applet/C/change-log.html
 share/gnome/help/mini-commander_applet/C/clock.html
@@ -478,89 +485,50 @@ share/locale/pt/LC_MESSAGES/gnome-core.mo
 share/locale/ru/LC_MESSAGES/gnome-core.mo
 share/locale/sv/LC_MESSAGES/gnome-core.mo
 share/locale/wa/LC_MESSAGES/gnome-core.mo
-@dirrm etc/CORBA/servers
-@dirrm etc/CORBA
-@dirrm etc/sound/events
-@dirrm share/gnome/applets/Amusements
-@dirrm share/gnome/applets/Monitors
-@dirrm share/gnome/applets/Multimedia
-@dirrm share/gnome/applets/Network
-@dirrm share/gnome/applets/Utility
-@dirrm share/gnome/applets
-@dirrm share/gnome/apps/Applications
-@dirrm share/gnome/apps/Games
-@dirrm share/gnome/apps/Graphics
-@dirrm share/gnome/apps/Internet
-@dirrm share/gnome/apps/Multimedia
-@dirrm share/gnome/apps/Settings
-@dirrm share/gnome/apps/System
-@dirrm share/gnome/apps/Utilities
-@dirrm share/gnome/apps
-@dirrm share/gnome/asclock/Freeamp
-@dirrm share/gnome/asclock/Newstone
-@dirrm share/gnome/asclock/Orb
-@dirrm share/gnome/asclock/Stone
-@dirrm share/gnome/asclock/beats
-@dirrm share/gnome/asclock/classic
-@dirrm share/gnome/asclock/shaped
-@dirrm share/gnome/asclock
-@dirrm share/gnome/gnome/help/help-browser/ko
-@dirrm share/gnome/gnome/help/help-browser
-@dirrm share/gnome/gnome/help
-@dirrm share/gnome/gnome
-@dirrm share/gnome/help/gnome-intro
-@dirrm share/gnome/help/gnome-intro/C
-@dirrm share/gnome/help/gnome-intro/C/pix
-@dirrm share/gnome/help/help-browser/C
-@dirrm share/gnome/help/help-browser/es
-@dirrm share/gnome/help/help-browser/fr
-@dirrm share/gnome/help/help-browser/hu
-@dirrm share/gnome/help/help-browser/it
-@dirrm share/gnome/help/help-browser/no
-@dirrm share/gnome/help/help-browser
+@dirrm share/gnome/xmodmap
+@dirrm share/gnome/pixmaps/tiles
+@dirrm share/gnome/pixmaps/mini-commander
+@dirrm share/gnome/pixmaps/mailcheck
+@dirrm share/gnome/pixmaps/gkb
+@dirrm share/gnome/pixmaps/fish
+@dirrm share/gnome/mc/templates
+@dirrm share/gnome/mc
 @dirrm share/gnome/help/mini-commander_applet/C
 @dirrm share/gnome/help/mini-commander_applet
+@dirrm share/gnome/help/help-browser/no
+@dirrm share/gnome/help/help-browser/ko
+@dirrm share/gnome/help/help-browser/it
+@dirrm share/gnome/help/help-browser/hu
+@dirrm share/gnome/help/help-browser/fr
+@dirrm share/gnome/help/help-browser/es
+@dirrm share/gnome/help/help-browser/C
+@dirrm share/gnome/help/help-browser
+@dirrm share/gnome/help/gnome-intro/C/pix
+@dirrm share/gnome/help/gnome-intro/C
+@dirrm share/gnome/help/gnome-intro
 @dirrm share/gnome/help
-@dirrm share/gnome/idl
-@dirrm share/gnome/mc/templates
-@dirrm share/gnome/mc
-@dirrm share/gnome/pixmaps/fish
-@dirrm share/gnome/pixmaps/gkb
-@dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/tiles
-@dirrm share/gnome/pixmaps
-@dirrm share/gnome/xmodmap
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es_DO/LC_MESSAGES
-@dirrm share/locale/es_DO
-@dirrm share/locale/es_GT/LC_MESSAGES
-@dirrm share/locale/es_GT
-@dirrm share/locale/es_HN/LC_MESSAGES
-@dirrm share/locale/es_HN
-@dirrm share/locale/es_MX/LC_MESSAGES
-@dirrm share/locale/es_MX
-@dirrm share/locale/es_PA/LC_MESSAGES
-@dirrm share/locale/es_PA
-@dirrm share/locale/es_PE/LC_MESSAGES
-@dirrm share/locale/es_PE
-@dirrm share/locale/es_SV/LC_MESSAGES
-@dirrm share/locale/es_SV
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/wa/LC_MESSAGES
+@dirrm share/gnome/asclock/shaped
+@dirrm share/gnome/asclock/classic
+@dirrm share/gnome/asclock/beats
+@dirrm share/gnome/asclock/Stone
+@dirrm share/gnome/asclock/Orb
+@dirrm share/gnome/asclock/Newstone
+@dirrm share/gnome/asclock/Freeamp
+@dirrm share/gnome/asclock
+@dirrm share/gnome/apps/Utilities
+@dirrm share/gnome/apps/System
+@dirrm share/gnome/apps/Settings
+@dirrm share/gnome/apps/Multimedia
+@dirrm share/gnome/apps/Internet
+@dirrm share/gnome/apps/Graphics
+@dirrm share/gnome/apps/Games
+@dirrm share/gnome/apps/Applications
+@dirrm share/gnome/apps
+@dirrm share/gnome/applets/Utility
+@dirrm share/gnome/applets/Network
+@dirrm share/gnome/applets/Multimedia
+@dirrm share/gnome/applets/Monitors
+@dirrm share/gnome/applets/Amusements
+@dirrm share/gnome/applets
+@dirrm etc/CORBA/servers
+@dirrm etc/CORBA