From owner-freebsd-ports Mon Oct 18 10:20:14 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 092A014F80 for ; Mon, 18 Oct 1999 10:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id KAA88722; Mon, 18 Oct 1999 10:20:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E68214A1B; Mon, 18 Oct 1999 10:15:11 -0700 (PDT) Message-Id: <19991018171511.2E68214A1B@hub.freebsd.org> Date: Mon, 18 Oct 1999 10:15:11 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@freebsd.org X-Send-Pr-Version: www-1.0 Subject: ports/14402: Update port: devel/gide to 0.1.5 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 14402 >Category: ports >Synopsis: Update port: devel/gide to 0.1.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Oct 18 10:20:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 3.3-RELEASE i386 >Organization: >Environment: >Description: * Updated version 0.1.2 to 0.1.5 New file: patches/patch-aj patches/patch-ak patches/patch-al patches/patch-am patches/patch-an patches/patch-ao patches/patch-ap patches/patch-aq patches/patch-ar patches/patch-as patches/patch-at Remove file: patches/patch-ac >How-To-Repeat: >Fix: diff -urN /usr/ports/devel/gide/Makefile devel/gide/Makefile --- /usr/ports/devel/gide/Makefile Wed Aug 25 21:15:08 1999 +++ devel/gide/Makefile Tue Oct 19 01:59:54 1999 @@ -1,20 +1,20 @@ # New ports collection makefile for: gIDE -# Version required: 0.1.2 +# Version required: 0.1.5 # Date created: 29 Jul 1998 # Whom: rom # # $FreeBSD: ports/devel/gide/Makefile,v 1.27 1999/08/25 05:48:03 obrien Exp $ # -DISTNAME= gIDE-0.1.2 -PKGNAME= gide-0.1.2 +DISTNAME= gIDE-0.1.5 +PKGNAME= gide-0.1.5 CATEGORIES= devel gnome MASTER_SITES= http://gide.gdev.net/ \ http://gide.pn.org/ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= gnomeui.2:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnomeui.3:${PORTSDIR}/x11/gnomelibs \ guile.4:${PORTSDIR}/lang/guile GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -22,18 +22,22 @@ FETCH_BEFORE_ARGS= -b USE_X_PREFIX= yes -USE_GMAKE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} +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} MAN1= gide.1 gdbio.1 -pre-install: - @${MKDIR} ${PREFIX}/share/gnome/gIDE/extra +post-patch: + @${PERL} -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/*.c + @${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/src/*.c + +post-install: + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include diff -urN /usr/ports/devel/gide/files/md5 devel/gide/files/md5 --- /usr/ports/devel/gide/files/md5 Thu Jun 24 21:35:14 1999 +++ devel/gide/files/md5 Fri Oct 15 20:30:28 1999 @@ -1 +1 @@ -MD5 (gIDE-0.1.2.tar.gz) = adc38514d2a925b7d053f29917d9028d +MD5 (gIDE-0.1.5.tar.gz) = 6b545ee64c5d12b163d3c994de6b4d3f diff -urN /usr/ports/devel/gide/patches/patch-ac devel/gide/patches/patch-ac --- /usr/ports/devel/gide/patches/patch-ac Thu Jun 24 21:35:14 1999 +++ devel/gide/patches/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,25 +0,0 @@ ---- gide.c.orig Thu Apr 22 09:56:05 1999 -+++ gide.c Wed Jun 23 16:11:39 1999 -@@ -256,17 +256,17 @@ - #endif - - 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:/usr/local/include:/usr/X11R6/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:/usr/local/lib:/usr/X11R6/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->xterm = (gchar *) realloc( cfg->xterm, 10 ); - strcpy( cfg->xterm, "xterm" ); diff -urN /usr/ports/devel/gide/patches/patch-ai devel/gide/patches/patch-ai --- /usr/ports/devel/gide/patches/patch-ai Thu Sep 9 21:06:12 1999 +++ devel/gide/patches/patch-ai Mon Oct 18 22:06:48 1999 @@ -1,23 +1,18 @@ ---- Makefile.in.orig Sat Jun 19 11:10:33 1999 -+++ Makefile.in Wed Sep 8 15:40:09 1999 -@@ -190,7 +190,7 @@ - $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile - --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) -+Makefile: $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ +--- Makefile.in.orig Fri Oct 8 00:40:37 1999 ++++ Makefile.in Mon Oct 18 22:06:39 1999 +@@ -151,10 +151,9 @@ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -@@ -198,7 +198,6 @@ - cd $(srcdir) && $(ACLOCAL) + $(ACLOCAL_M4): configure.in acinclude.m4 +- cd $(srcdir) && $(ACLOCAL) config.status: $(srcdir)/configure - $(SHELL) ./config.status --recheck ++ $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -@@ -330,8 +329,8 @@ +@@ -277,8 +276,8 @@ distcheck: dist -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz @@ -28,7 +23,7 @@ dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ && ../configure --srcdir=.. --prefix=$$dc_install_base \ -@@ -355,7 +354,7 @@ +@@ -302,7 +301,7 @@ -rm -rf $(distdir) distdir: $(DISTFILES) -rm -rf $(distdir) @@ -37,19 +32,19 @@ -chmod 777 $(distdir) here=`cd $(top_builddir) && pwd`; \ top_distdir=`cd $(distdir) && pwd`; \ -@@ -370,7 +369,7 @@ - || cp -p $$d/$$file $(distdir)/$$file; \ +@@ -318,7 +317,7 @@ done - --DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) -+DEPS_MAGIC := $(shell mkdir -p .deps > /dev/null 2>&1 || :) - - -include $(DEP_FILES) - -@@ -464,12 +463,12 @@ - LIBS += $(GTK_LIBS) $(X_LIBS) + for subdir in $(SUBDIRS); do \ + test -d $(distdir)/$$subdir \ +- || mkdir $(distdir)/$$subdir \ ++ || mkdir -p $(distdir)/$$subdir \ + || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ +@@ -404,12 +403,12 @@ install-pkgdataDATA: + rm -rf $(pkgdatadir) - mkdir $(pkgdatadir) - mkdir $(pkgdatadir)/extra + mkdir -p $(pkgdatadir) diff -urN /usr/ports/devel/gide/patches/patch-aj devel/gide/patches/patch-aj --- /usr/ports/devel/gide/patches/patch-aj Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-aj Mon Oct 18 20:19:50 1999 @@ -0,0 +1,13 @@ +--- src/gI_document.c.orig Mon Oct 18 19:48:54 1999 ++++ src/gI_document.c Mon Oct 18 19:56:06 1999 +@@ -41,8 +41,8 @@ + #include "gI_menus.h" + + #ifdef HAVE_GTKTEXT_PATCH +-#include +-#include ++#include "GtkSCText/gtksctext.h" ++#include "GtkEditor/gtkeditor/gtkeditor.h" + #endif + + /* externs */ diff -urN /usr/ports/devel/gide/patches/patch-ak devel/gide/patches/patch-ak --- /usr/ports/devel/gide/patches/patch-ak Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-ak Mon Oct 18 20:01:23 1999 @@ -0,0 +1,13 @@ +--- src/gI_file.c.orig Mon Oct 18 19:48:54 1999 ++++ src/gI_file.c Mon Oct 18 19:57:47 1999 +@@ -38,8 +38,8 @@ + #include "gI_project.h" + + #ifdef HAVE_GTKTEXT_PATCH +-#include +-#include ++#include "GtkSCText/gtksctext.h" ++#include "GtkEditor/gtkeditor/gtkeditor.h" + #include "gI_globpatterns.h" + #endif + diff -urN /usr/ports/devel/gide/patches/patch-al devel/gide/patches/patch-al --- /usr/ports/devel/gide/patches/patch-al Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-al Mon Oct 18 20:01:33 1999 @@ -0,0 +1,11 @@ +--- src/gI_globpatterns.h.orig Thu Jul 1 04:11:42 1999 ++++ src/gI_globpatterns.h Mon Oct 18 19:58:28 1999 +@@ -21,7 +21,7 @@ + #ifndef GLOB_PATTERNS_H + #define GLOB_PATTERNS_H + +-#include ++#include "GtkEditor/gtkeditor/gtkeditor.h" + #include "gI_hilite.h" + + /* gI_globpatterns -- used for associating filenames with highlight diff -urN /usr/ports/devel/gide/patches/patch-am devel/gide/patches/patch-am --- /usr/ports/devel/gide/patches/patch-am Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-am Mon Oct 18 21:12:56 1999 @@ -0,0 +1,11 @@ +--- src/gI_guilesupport.c.orig Mon Oct 18 20:23:57 1999 ++++ src/gI_guilesupport.c Mon Oct 18 21:12:27 1999 +@@ -20,7 +20,7 @@ + #ifdef HAVE_LIBGUILE + + #include +-#include ++#include "GtkEditor/gtkeditor/gtkeditor.h" + + #include + #include diff -urN /usr/ports/devel/gide/patches/patch-an devel/gide/patches/patch-an --- /usr/ports/devel/gide/patches/patch-an Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-an Mon Oct 18 20:01:42 1999 @@ -0,0 +1,11 @@ +--- src/gI_hilite.c.orig Mon Oct 18 19:48:54 1999 ++++ src/gI_hilite.c Mon Oct 18 19:59:13 1999 +@@ -21,7 +21,7 @@ + + #include + #include +-#include ++#include "GtkEditor/gtkeditor/gtkeditor.h" + + #include + #include diff -urN /usr/ports/devel/gide/patches/patch-ao devel/gide/patches/patch-ao --- /usr/ports/devel/gide/patches/patch-ao Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-ao Mon Oct 18 20:01:53 1999 @@ -0,0 +1,11 @@ +--- src/gI_hilite.h.orig Mon Jul 5 00:58:27 1999 ++++ src/gI_hilite.h Mon Oct 18 19:59:58 1999 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include "GtkEditor/gtkeditor/gtkeditor.h" + + typedef struct _gI_HilitePattern gI_HilitePattern; + struct _gI_HilitePattern diff -urN /usr/ports/devel/gide/patches/patch-ap devel/gide/patches/patch-ap --- /usr/ports/devel/gide/patches/patch-ap Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-ap Mon Oct 18 20:59:32 1999 @@ -0,0 +1,11 @@ +--- src/gI_prefs.c.orig Mon Oct 18 20:23:57 1999 ++++ src/gI_prefs.c Mon Oct 18 20:58:04 1999 +@@ -39,7 +39,7 @@ + #endif + + #ifdef HAVE_GTKTEXT_PATCH +-#include ++#include "GtkSCText/gtksctext.h" + #include "gI_hilite.h" + #endif + diff -urN /usr/ports/devel/gide/patches/patch-aq devel/gide/patches/patch-aq --- /usr/ports/devel/gide/patches/patch-aq Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-aq Mon Oct 18 21:13:49 1999 @@ -0,0 +1,11 @@ +--- src/gI_search.c.orig Mon Oct 18 20:23:58 1999 ++++ src/gI_search.c Mon Oct 18 21:03:23 1999 +@@ -32,7 +32,7 @@ + #include "regex.h" + #endif + #ifdef HAVE_GTKTEXT_PATCH +-#include ++#include "GtkSCText/gtksctext.h" + #endif + + #include "structs.h" diff -urN /usr/ports/devel/gide/patches/patch-ar devel/gide/patches/patch-ar --- /usr/ports/devel/gide/patches/patch-ar Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-ar Mon Oct 18 20:22:22 1999 @@ -0,0 +1,25 @@ +--- 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 + + 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->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" ); diff -urN /usr/ports/devel/gide/patches/patch-as devel/gide/patches/patch-as --- /usr/ports/devel/gide/patches/patch-as Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-as Mon Oct 18 20:02:08 1999 @@ -0,0 +1,11 @@ +--- src/structs.h.orig Mon Jul 5 00:58:27 1999 ++++ src/structs.h Mon Oct 18 20:00:32 1999 +@@ -26,7 +26,7 @@ + /* Structs for gIDE */ + + #ifdef HAVE_GTKTEXT_PATCH +-#include ++#include "GtkEditor/gtkeditor/gtkeditor.h" + #endif + + /* defines */ diff -urN /usr/ports/devel/gide/patches/patch-at devel/gide/patches/patch-at --- /usr/ports/devel/gide/patches/patch-at Thu Jan 1 09:00:00 1970 +++ devel/gide/patches/patch-at Mon Oct 18 20:43:35 1999 @@ -0,0 +1,11 @@ +--- src/GtkEditor/gtkeditor/gtkeditor.h.orig Fri Jun 4 15:53:30 1999 ++++ src/GtkEditor/gtkeditor/gtkeditor.h Mon Oct 18 20:42:55 1999 +@@ -23,7 +23,7 @@ + #define __GTK_EDITOR_H__ + + #include +-#include ++#include "../../GtkSCText/gtksctext.h" + + + #ifdef __cplusplus diff -urN /usr/ports/devel/gide/pkg/PLIST devel/gide/pkg/PLIST --- /usr/ports/devel/gide/pkg/PLIST Mon Jun 7 21:09:50 1999 +++ devel/gide/pkg/PLIST Mon Oct 18 21:36:23 1999 @@ -1,5 +1,19 @@ bin/gdbio bin/gide +include/gtksctext.h +include/gtkeditor/gtkeditor.h +include/gtkeditor/gtkhint.h +lib/libgtkeditor.a +lib/libgtkeditor.so +lib/libgtkeditor.so.0 +lib/libgtksctext.a +lib/libgtksctext.so +lib/libgtksctext.so.0 +lib/libregex.a +lib/libregex.so +lib/libregex.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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message