Update to 0.3.0, claim MAINTAINERship from ports@FreeBSD.org

6 files changed, 141 insertions, 36 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index c2155de6c481..48e13fd923fd 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME= 	gide
-PORTVERSION= 	0.1.7
+PORTVERSION= 	0.3.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://gide.pn.org/
+MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	unstable/sources/gIDE
-DISTNAME= 	gIDE-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ade@FreeBSD.org
 
 LIB_DEPENDS=	gnomeui.3:${PORTSDIR}/x11/gnomelibs \
+		glade.3:${PORTSDIR}/devel/libglade \
 		guile.6:${PORTSDIR}/lang/guile
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -23,10 +22,11 @@ GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib -lgnuregex"
-CONFIGURE_ARGS=	--with-gnome=${PREFIX}
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gide.1 gdbio.1
 
diff --git a/devel/gide/distinfo b/devel/gide/distinfo
index 3900dd6f492b..b39b999e10aa 100644
--- a/devel/gide/distinfo
+++ b/devel/gide/distinfo
@@ -1 +1 @@
-MD5 (gIDE-0.1.7.tar.gz) = 22664138059fad610242a7783285aa1c
+MD5 (gide-0.3.0.tar.gz) = b7195eef0c3155ed239adef252428ffc
diff --git a/devel/gide/files/patch-bb b/devel/gide/files/patch-bb
new file mode 100644
index 000000000000..28789b97b335
--- /dev/null
+++ b/devel/gide/files/patch-bb
@@ -0,0 +1,36 @@
+--- configure.orig	Fri May 12 16:14:47 2000
++++ configure	Wed May 17 09:36:16 2000
+@@ -2238,8 +2238,9 @@
+ #define WITH_REGEX 1
+ EOF
+ 
+-  echo $ac_n "checking for GNU regex in libc""... $ac_c" 1>&6
+-echo "configure:2243: checking for GNU regex in libc" >&5
++LIBS="$LIBS -lgnuregex"
++  echo $ac_n "checking for GNU regex in libgnuregex""... $ac_c" 1>&6
++echo "configure:2243: checking for GNU regex in libgnuregex" >&5
+ if eval "test \"`echo '$''{'am_cv_gnu_regex'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -5163,15 +5164,15 @@
+ fi
+ 
+         
+-	USE_INCLUDED_LIBINTL=yes
++	USE_INCLUDED_LIBINTL=no
+         CATOBJEXT=.gmo
+         INSTOBJEXT=.mo
+         DATADIRNAME=share
+-	INTLDEPS='$(top_builddir)/intl/libintl.a'
+-	INTLLIBS=$INTLDEPS
+-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+-        nls_cv_header_intl=intl/libintl.h
+-        nls_cv_header_libgt=intl/libgettext.h
++	INTLDEPS=
++	INTLLIBS=
++	LIBS='-lintl'
++        nls_cv_header_intl=
++        nls_cv_header_libgt=
+       fi
+ 
+             if test "$XGETTEXT" != ":"; then
diff --git a/devel/gide/files/patch-bc b/devel/gide/files/patch-bc
new file mode 100644
index 000000000000..f6228f6a6bcd
--- /dev/null
+++ b/devel/gide/files/patch-bc
@@ -0,0 +1,66 @@
+--- plugins/asciitable/Makefile.in.orig	Sun May 14 10:11:31 2000
++++ plugins/asciitable/Makefile.in	Wed May 17 09:39:52 2000
+@@ -157,7 +157,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_asciitable_la_LDFLAGS = 
++libgide_asciitable_la_LDFLAGS = -avoid-version
+ libgide_asciitable_la_LIBADD = 
+ libgide_asciitable_la_OBJECTS =  plugin_asciitable.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- plugins/browser/Makefile.in.orig	Sun May 14 10:11:35 2000
++++ plugins/browser/Makefile.in	Wed May 17 09:40:10 2000
+@@ -163,7 +163,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_browser_la_LDFLAGS = 
++libgide_browser_la_LDFLAGS = -avoid-version
+ libgide_browser_la_DEPENDENCIES =  GtkSCB/libGtkSCB.la
+ libgide_browser_la_OBJECTS =  plugin_browser.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- plugins/calculator/Makefile.in.orig	Sun May 14 10:11:33 2000
++++ plugins/calculator/Makefile.in	Wed May 17 09:40:22 2000
+@@ -157,7 +157,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_calculator_la_LDFLAGS = 
++libgide_calculator_la_LDFLAGS = -avoid-version
+ libgide_calculator_la_LIBADD = 
+ libgide_calculator_la_OBJECTS =  plugin_calculator.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- plugins/docstat/Makefile.in.orig	Sun May 14 10:11:34 2000
++++ plugins/docstat/Makefile.in	Wed May 17 09:40:34 2000
+@@ -157,7 +157,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_docstat_la_LDFLAGS = 
++libgide_docstat_la_LDFLAGS = -avoid-version
+ libgide_docstat_la_LIBADD = 
+ libgide_docstat_la_OBJECTS =  plugin_docstat.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- plugins/sample/Makefile.in.orig	Sun May 14 10:11:29 2000
++++ plugins/sample/Makefile.in	Wed May 17 09:40:45 2000
+@@ -163,7 +163,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_sample_la_LDFLAGS = 
++libgide_sample_la_LDFLAGS = -avoid-version
+ libgide_sample_la_LIBADD = 
+ libgide_sample_la_OBJECTS =  plugin-sample.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+--- plugins/text/Makefile.in.orig	Sun May 14 10:11:32 2000
++++ plugins/text/Makefile.in	Wed May 17 09:40:55 2000
+@@ -158,7 +158,7 @@
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+ LIBS = @LIBS@
+-libgide_text_la_LDFLAGS = 
++libgide_text_la_LDFLAGS = -avoid-version
+ libgide_text_la_LIBADD = 
+ libgide_text_la_OBJECTS =  plugin_text.lo plugin_text_insert.lo \
+ plugin_text_delete.lo plugin_text_replace.lo
diff --git a/devel/gide/files/patch-bd b/devel/gide/files/patch-bd
new file mode 100644
index 000000000000..36011e1c05c8
--- /dev/null
+++ b/devel/gide/files/patch-bd
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig	Sun May 14 10:11:41 2000
++++ src/Makefile.in	Wed May 17 09:46:40 2000
+@@ -161,7 +161,7 @@
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lgnuregex
+ gide_OBJECTS =  gI_about.o gI_cfp.o gI_compile.o gI_document.o gI_edit.o \
+ gI_file.o gI_files.o gI_functions.o gI_help.o gI_menus.o gI_prefs.o \
+ gI_project.o gI_search.o gI_tools.o gI_run.o gI_tree.o gI_window.o \
diff --git a/devel/gide/pkg-plist b/devel/gide/pkg-plist
index 955d40fcc78b..e335451b2108 100644
--- a/devel/gide/pkg-plist
+++ b/devel/gide/pkg-plist
@@ -1,40 +1,32 @@
 bin/gdbio
 bin/gide
-include/gtkeditor.h
-include/gtkhint.h
-include/gtksctext.h
-lib/gide/plugins/%%VERSION%%/libgide_asciitable.a
 lib/gide/plugins/%%VERSION%%/libgide_asciitable.so
-lib/gide/plugins/%%VERSION%%/libgide_asciitable.so.0
-lib/gide/plugins/%%VERSION%%/libgide_calculator.a
+lib/gide/plugins/%%VERSION%%/libgide_browser.so
 lib/gide/plugins/%%VERSION%%/libgide_calculator.so
-lib/gide/plugins/%%VERSION%%/libgide_calculator.so.0
-lib/gide/plugins/%%VERSION%%/libgide_docstat.a
 lib/gide/plugins/%%VERSION%%/libgide_docstat.so
-lib/gide/plugins/%%VERSION%%/libgide_docstat.so.0
-lib/gide/plugins/%%VERSION%%/libgide_sample.a
 lib/gide/plugins/%%VERSION%%/libgide_sample.so
-lib/gide/plugins/%%VERSION%%/libgide_sample.so.0
-lib/gide/plugins/%%VERSION%%/libgide_text.a
 lib/gide/plugins/%%VERSION%%/libgide_text.so
-lib/gide/plugins/%%VERSION%%/libgide_text.so.0
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-share/gIDE/extra/README
-share/gIDE/extra/compile_sets
-share/gIDE/extra/functions.highlight
-share/gIDE/extra/functions.ignore
-share/gIDE/extra/gide.conf
-share/gIDE/extra/gide.scm
-share/gIDE/extra/glob
-share/gIDE/extra/glob.scm
-share/gIDE/extra/patterns
-share/gIDE/extra/patterns.scm
 share/gnome/apps/Development/gIDE.desktop
-share/locale/fr/LC_MESSAGES/gIDE.mo
+share/gnome/gide/extra/README
+share/gnome/gide/extra/compile_sets
+share/gnome/gide/extra/functions.highlight
+share/gnome/gide/extra/functions.ignore
+share/gnome/gide/extra/gide.conf
+share/gnome/gide/extra/gide.scm
+share/gnome/gide/extra/glob
+share/gnome/gide/extra/glob.scm
+share/gnome/gide/extra/patterns
+share/gnome/gide/extra/patterns.scm
+share/gnome/gide/glade/file-search-replace.glade
+share/gnome/gide/glade/plugin-manager.glade
+share/gnome/gide/glade/search-replace.glade
+share/gnome/pixmaps/gide.png
+share/locale/fr/LC_MESSAGES/gide.mo
+share/locale/ja/LC_MESSAGES/gide.mo
+@dirrm share/gnome/gide/glade
+@dirrm share/gnome/gide/extra
+@dirrm share/gnome/gide
 @unexec rmdir %D/share/gnome/apps/Development 2>/dev/null || true
-@dirrm share/gIDE/extra
-@dirrm share/gIDE
 @dirrm lib/gide/plugins/%%VERSION%%
 @dirrm lib/gide/plugins
 @dirrm lib/gide