Update port to 0.1.7

PR:		17050
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

7 files changed, 106 insertions, 45 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 8404cf3..66c2e3b 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	gIDE
-# Version required:			0.1.6
+# Version required:			0.1.7
 # Date created:				29 Jul 1998
 # Whom:					rom
 #
 # $FreeBSD$
 #
 
-DISTNAME= 	gIDE-0.1.6
-PKGNAME= 	gide-0.1.6
+DISTNAME= 	gIDE-0.1.7
+PKGNAME= 	gide-0.1.7
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://gide.pn.org/
 MASTER_SITE_SUBDIR=	unstable/sources/gIDE
 
 MAINTAINER=	ports@FreeBSD.org
@@ -24,15 +25,16 @@ USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
-		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		LIBS="-L${LOCALBASE}/lib -lgnuregex"
+CONFIGURE_ARGS=	--with-gnome=${PREFIX}
 
 MAN1=		gide.1 gdbio.1
 
+VERSION=	${DISTNAME:S/gIDE-//}
+PLIST_SUB=	VERSION=${VERSION}
+
 post-patch:
-	@${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/*.c
-	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/src/*.c
+	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
+	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
 
 .include <bsd.port.mk>
diff --git a/devel/gide/distinfo b/devel/gide/distinfo
index 53213fa..3900dd6 100644
--- a/devel/gide/distinfo
+++ b/devel/gide/distinfo
@@ -1 +1 @@
-MD5 (gIDE-0.1.6.tar.gz) = 6e9fa7818e63633fd39c830a1e2c9808
+MD5 (gIDE-0.1.7.tar.gz) = 22664138059fad610242a7783285aa1c
diff --git a/devel/gide/files/patch-ar b/devel/gide/files/patch-ar
index 894b745..8449549 100644
--- a/devel/gide/files/patch-ar
+++ b/devel/gide/files/patch-ar
@@ -1,25 +1,22 @@
---- src/gide.c.orig	Tue Aug 17 00:06:24 1999
-+++ src/gide.c	Mon Oct 18 20:17:29 1999
-@@ -292,17 +292,17 @@
- #endif
+--- src/gide.c.orig	Sun Feb 27 00:59:52 2000
++++ src/gide.c	Mon Feb 28 00:50:43 2000
+@@ -260,16 +260,16 @@
  
-     cfg->tab_width = 4;
--    cfg->incpath = (gchar *) realloc( cfg->incpath, 40 );
--    strcpy( cfg->incpath, "/usr/include:/usr/local/include" );
-+    cfg->incpath = (gchar *) realloc( cfg->incpath, 60 );
-+    strcpy( cfg->incpath, "/usr/include:%%LOCALBASE%%/include:%%X11BASE%%/include" );
-     cfg->ccopt = (gchar *) realloc( cfg->ccopt, 2 );
-     strcpy( cfg->ccopt, "" );
--    cfg->libpath = (gchar *) realloc( cfg->libpath, 40 );
--    strcpy( cfg->libpath, "/lib:/usr/lib:/usr/local/lib" );
-+    cfg->libpath = (gchar *) realloc( cfg->libpath, 60 );
-+    strcpy( cfg->libpath, "/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib" );
-     cfg->ldopt = (gchar *) realloc( cfg->ldopt, 2 );
-     strcpy( cfg->ldopt, "" );
+ 	cfg->tab_width = 4;
+ 	cfg->incpath = (gchar *) realloc( cfg->incpath, 40 );
+-	strcpy( cfg->incpath, "/usr/include:/usr/local/include" );
++	strcpy( cfg->incpath, "/usr/include:%%LOCALBASE%%/include:%%X11BASE%%/include" );
+ 	cfg->ccopt = (gchar *) realloc( cfg->ccopt, 2 );
+ 	strcpy( cfg->ccopt, "" );
+ 	cfg->libpath = (gchar *) realloc( cfg->libpath, 40 );
+-	strcpy( cfg->libpath, "/lib:/usr/lib:/usr/local/lib" );
++	strcpy( cfg->libpath, "/lib:/usr/lib:%%LOCALBASE%%/lib:%%X11BASE%%/lib" );
+ 	cfg->ldopt = (gchar *) realloc( cfg->ldopt, 2 );
+ 	strcpy( cfg->ldopt, "" );
  
-     cfg->bash = (gchar *) realloc( cfg->bash, 20 );
--    strcpy( cfg->bash, "/bin/bash" );
-+    strcpy( cfg->bash, "/bin/sh" );
+ 	cfg->bash = (gchar *) realloc( cfg->bash, 20 );
+-	strcpy( cfg->bash, "/bin/bash" );
++	strcpy( cfg->bash, "/bin/sh" );
  
-     cfg->xterm = (gchar *) realloc( cfg->xterm, 10 );
-     strcpy( cfg->xterm, "xterm" );
+ 	cfg->xterm = (gchar *) realloc( cfg->xterm, 10 );
+ 	strcpy( cfg->xterm, "xterm" );
diff --git a/devel/gide/files/patch-aw b/devel/gide/files/patch-aw
new file mode 100644
index 0000000..8f6dbb7
--- /dev/null
+++ b/devel/gide/files/patch-aw
@@ -0,0 +1,14 @@
+--- src/GtkEditor/gtkeditor/gtkeditor-regex.h.orig	Mon Oct 11 09:49:57 1999
++++ src/GtkEditor/gtkeditor/gtkeditor-regex.h	Mon Feb 28 01:35:42 2000
+@@ -24,7 +24,11 @@
+ #define GTKEDITOR_REGEX_H
+ 
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#include <gnuregex.h>
++#else
+ #include <regex.h>
++#endif
+ #include <string.h>
+ 
+ #include <gtk/gtk.h>
diff --git a/devel/gide/files/patch-ax b/devel/gide/files/patch-ax
new file mode 100644
index 0000000..5fe455e
--- /dev/null
+++ b/devel/gide/files/patch-ax
@@ -0,0 +1,14 @@
+--- src/GtkEditor/gtkeditor/gtkhint.c.orig	Mon Dec  6 01:40:45 1999
++++ src/GtkEditor/gtkeditor/gtkhint.c	Mon Feb 28 01:41:00 2000
+@@ -31,7 +31,11 @@
+ #include <gtk/gtktext.h>
+ 
+ #include "gtkeditor.h"
++#ifdef __FreeBSD__
++#include <gnuregex.h>
++#else
+ #include "regex.h"
++#endif
+ #include "gtkhint.h"
+ 
+ 
diff --git a/devel/gide/files/patch-ay b/devel/gide/files/patch-ay
new file mode 100644
index 0000000..d1dd3f5
--- /dev/null
+++ b/devel/gide/files/patch-ay
@@ -0,0 +1,14 @@
+--- src/GtkEditor/gtkeditor/internal.h.orig	Mon Oct 11 09:49:57 1999
++++ src/GtkEditor/gtkeditor/internal.h	Mon Feb 28 01:33:16 2000
+@@ -24,7 +24,11 @@
+ #define INTERNAL_H
+ 
+ #include <sys/types.h>
++#ifdef __FreeBSD__
++#include <gnuregex.h>
++#else
+ #include <regex.h>
++#endif
+ 
+ #include "gtkeditor.h"
+ #include "syntaxtable.h"
diff --git a/devel/gide/pkg-plist b/devel/gide/pkg-plist
index 4ff372a..955d40f 100644
--- a/devel/gide/pkg-plist
+++ b/devel/gide/pkg-plist
@@ -3,18 +3,38 @@ 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_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/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/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
-@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