Attachment 19710 Details for Bug 34983 – file.diff

[patch] file.diff

file.diff (text/plain), 22.37 KB, created by Joe Marcus Clarke on 2002-02-15 23:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joe Marcus Clarke

Created: 2002-02-15 23:20:01 UTC

Size: 22.37 KB

patch

obsolete

>--- Makefile.orig	Fri Feb 15 18:04:17 2002
>+++ Makefile	Fri Feb 15 17:14:00 2002
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	anjuta
>-PORTVERSION=	0.1.8
>+PORTVERSION=	0.1.9
> CATEGORIES=	devel gnome
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	anjuta
>@@ -23,9 +23,10 @@
> 		LIBS="-L${LOCALBASE}/lib"
> 
> pre-patch:
>-	@${PERL} -pi -e 's#-lpthread#-pthread#g ; \
>+	@${PERL} -pi -e 's#-lpthread#${PTHREAD_LIBS}#g ; \
> 		 s#DATADIRNAME=lib#DATADIRNAME=share#g' ${WRKSRC}/configure
>-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
>-		's#\$$datadir$/locale#\$$prefix$/share/locale#g'
>+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
>+		's#\$$datadir$/gnome/#\$$datadir$/#g ; \
>+		 s#\$$datadir$/locale#\$$prefix$/share/locale#g'
> 
> .include <bsd.port.mk>
>--- distinfo.orig	Fri Feb 15 18:04:24 2002
>+++ distinfo	Thu Feb 14 22:08:44 2002
>@@ -1 +1 @@
>-MD5 (anjuta-0.1.8.tar.gz) = 7bdfe257961dfbdcd63e7b8d7411a5fa
>+MD5 (anjuta-0.1.9.tar.gz) = 645a108a816b30ecff1df13395e6ce00
>--- pkg-plist.orig	Fri Feb 15 18:04:35 2002
>+++ pkg-plist	Fri Feb 15 18:02:59 2002
>@@ -1,7 +1,13 @@
> bin/anjuta
> bin/anjuta_launcher
>+lib/anjuta/libanjuta_clsGen.a
>+lib/anjuta/libanjuta_clsGen.so
>+lib/anjuta/libanjuta_clsGen.so.0
>+lib/anjuta/libanjuta_sample1.a
>+lib/anjuta/libanjuta_sample1.so
>+lib/anjuta/libanjuta_sample1.so.0
> share/gnome/anjuta/README.stock_libs
>-share/gnome/anjuta/anjuta.properties
>+share/gnome/anjuta/anjuta_project.template
> share/gnome/anjuta/autogen.sh.generic
> share/gnome/anjuta/autogen.sh.gnome
> share/gnome/anjuta/autogen.sh.gnomemm
>@@ -36,7 +42,30 @@
> share/gnome/anjuta/gnome/linger.m4
> share/gnome/anjuta/gnome/need-declaration.m4
> share/gnome/anjuta/header.c
>-share/gnome/anjuta/internal.properties
>+share/gnome/anjuta/properties/ada.properties
>+share/gnome/anjuta/properties/anjuta.properties
>+share/gnome/anjuta/properties/baan.properties
>+share/gnome/anjuta/properties/bash.properties
>+share/gnome/anjuta/properties/conf.properties
>+share/gnome/anjuta/properties/cpp.properties
>+share/gnome/anjuta/properties/cs.properties
>+share/gnome/anjuta/properties/html.properties
>+share/gnome/anjuta/properties/idl.properties
>+share/gnome/anjuta/properties/java.properties
>+share/gnome/anjuta/properties/latex.properties
>+share/gnome/anjuta/properties/lua.properties
>+share/gnome/anjuta/properties/make.properties
>+share/gnome/anjuta/properties/others.properties
>+share/gnome/anjuta/properties/pascal.properties
>+share/gnome/anjuta/properties/perl.properties
>+share/gnome/anjuta/properties/props.properties
>+share/gnome/anjuta/properties/python.properties
>+share/gnome/anjuta/properties/rc.properties
>+share/gnome/anjuta/properties/ruby.properties
>+share/gnome/anjuta/properties/sample.properties
>+share/gnome/anjuta/properties/sql.properties
>+share/gnome/anjuta/properties/vb.properties
>+share/gnome/anjuta/properties/xml.properties
> share/gnome/anjuta/stock_libs.anj
> share/gnome/anjuta/system.tags
> share/gnome/anjuta/welcome.txt
>@@ -48,38 +77,11 @@
> share/gnome/help/anjuta/C/anjuta-manual/anjuta-manual.sgml
> share/gnome/help/anjuta/C/anjuta-manual/authors.html
> share/gnome/help/anjuta/C/anjuta-manual/authors.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/breaks-del.html
>-share/gnome/help/anjuta/C/anjuta-manual/breaks-edit.html
>-share/gnome/help/anjuta/C/anjuta-manual/breaks-enbdis.html
> share/gnome/help/anjuta/C/anjuta-manual/browsing-files.html
>+share/gnome/help/anjuta/C/anjuta-manual/build.sgml
> share/gnome/help/anjuta/C/anjuta-manual/building.html
>-share/gnome/help/anjuta/C/anjuta-manual/chapter01.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter02.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter03.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter04.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter05.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter06.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter07.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter08.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter09.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter10.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter11.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter12.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter13.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter14.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/chapter15.sgml
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-dyna-libs.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-interrupt.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-registers.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-restart.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-run.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-step-out.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-step-over.html
>-share/gnome/help/anjuta/C/anjuta-manual/dbg-stop.html
>-share/gnome/help/anjuta/C/anjuta-manual/debug-attach.html
>-share/gnome/help/anjuta/C/anjuta-manual/debug-core.html
>-share/gnome/help/anjuta/C/anjuta-manual/debug-loading.html
>-share/gnome/help/anjuta/C/anjuta-manual/debug-start.html
>+share/gnome/help/anjuta/C/anjuta-manual/compileopts.sgml
>+share/gnome/help/anjuta/C/anjuta-manual/debugger.sgml
> share/gnome/help/anjuta/C/anjuta-manual/debugger-exec.html
> share/gnome/help/anjuta/C/anjuta-manual/debugger-others.html
> share/gnome/help/anjuta/C/anjuta-manual/debugging-breaks.html
>@@ -88,8 +90,12 @@
> share/gnome/help/anjuta/C/anjuta-manual/debugging.html
> share/gnome/help/anjuta/C/anjuta-manual/defines.html
> share/gnome/help/anjuta/C/anjuta-manual/editing-files.html
>-share/gnome/help/anjuta/C/anjuta-manual/expr-watch.html
>+share/gnome/help/anjuta/C/anjuta-manual/execute.sgml
> share/gnome/help/anjuta/C/anjuta-manual/familiar.html
>+share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz1.png
>+share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz2.png
>+share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz3.png
>+share/gnome/help/anjuta/C/anjuta-manual/figures/appwiz4.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/arguments.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/attach.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/brk_add.png
>@@ -107,10 +113,12 @@
> share/gnome/help/anjuta/C/anjuta-manual/figures/find_replace.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/find_text.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/frame.png
>+share/gnome/help/anjuta/C/anjuta-manual/figures/impwiz.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/includes.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/inspect.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/lib_paths.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/libraries.png
>+share/gnome/help/anjuta/C/anjuta-manual/figures/mainwin.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/menu_detached.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/menu_main.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/message_win.png
>@@ -136,9 +144,12 @@
> share/gnome/help/anjuta/C/anjuta-manual/figures/watch.png
> share/gnome/help/anjuta/C/anjuta-manual/figures/watch_add.png
> share/gnome/help/anjuta/C/anjuta-manual/file-operations.html
>+share/gnome/help/anjuta/C/anjuta-manual/fileoperations.sgml
> share/gnome/help/anjuta/C/anjuta-manual/includes.html
> share/gnome/help/anjuta/C/anjuta-manual/index.html
>+share/gnome/help/anjuta/C/anjuta-manual/interface.sgml
> share/gnome/help/anjuta/C/anjuta-manual/introduction.html
>+share/gnome/help/anjuta/C/anjuta-manual/introduction.sgml
> share/gnome/help/anjuta/C/anjuta-manual/libpaths.html
> share/gnome/help/anjuta/C/anjuta-manual/libraries.html
> share/gnome/help/anjuta/C/anjuta-manual/license.html
>@@ -153,47 +164,36 @@
> share/gnome/help/anjuta/C/anjuta-manual/optimization.html
> share/gnome/help/anjuta/C/anjuta-manual/other-operations-files.html
> share/gnome/help/anjuta/C/anjuta-manual/others.html
>-share/gnome/help/anjuta/C/anjuta-manual/placeholder.html
> share/gnome/help/anjuta/C/anjuta-manual/preferences.html
>+share/gnome/help/anjuta/C/anjuta-manual/preferences.sgml
> share/gnome/help/anjuta/C/anjuta-manual/project-build.html
> share/gnome/help/anjuta/C/anjuta-manual/project-config.html
> share/gnome/help/anjuta/C/anjuta-manual/project-files.html
> share/gnome/help/anjuta/C/anjuta-manual/project-information.html
> share/gnome/help/anjuta/C/anjuta-manual/project-management.html
>+share/gnome/help/anjuta/C/anjuta-manual/projects.sgml
> share/gnome/help/anjuta/C/anjuta-manual/running.html
> share/gnome/help/anjuta/C/anjuta-manual/search-replace-files.html
> share/gnome/help/anjuta/C/anjuta-manual/setting-compiler-options.html
>-share/gnome/help/anjuta/C/anjuta-manual/stack-frame-info.html
>-share/gnome/help/anjuta/C/anjuta-manual/stack-frame.html
>-share/gnome/help/anjuta/C/anjuta-manual/stack-update.html
> share/gnome/help/anjuta/C/anjuta-manual/toolbars.html
> share/gnome/help/anjuta/C/anjuta-manual/warnings.html
> share/gnome/help/anjuta/C/topic.dat
> share/gnome/omf/anjuta/anjuta-faqs-C.omf
> share/gnome/omf/anjuta/anjuta-manual-C.omf
> share/gnome/pixmaps/anjuta/add.xpm
>+share/gnome/pixmaps/anjuta/an_tag.xpm
> share/gnome/pixmaps/anjuta/anjuta_icon.png
> share/gnome/pixmaps/anjuta/anjuta_logo.png
> share/gnome/pixmaps/anjuta/anjuta_splash.png
>-share/gnome/pixmaps/anjuta/app_wizard.jpg
>-share/gnome/pixmaps/anjuta/appwid_blank.xpm
>-share/gnome/pixmaps/anjuta/appwid_book.xpm
>-share/gnome/pixmaps/anjuta/appwid_cd.xpm
>-share/gnome/pixmaps/anjuta/appwid_chart.xpm
>-share/gnome/pixmaps/anjuta/appwid_console.xpm
>-share/gnome/pixmaps/anjuta/appwid_data.xpm
>-share/gnome/pixmaps/anjuta/appwid_debug.xpm
>-share/gnome/pixmaps/anjuta/appwid_draw.xpm
>-share/gnome/pixmaps/anjuta/appwid_gear.xpm
>-share/gnome/pixmaps/anjuta/appwid_globe.xpm
>-share/gnome/pixmaps/anjuta/appwid_lib.xpm
>-share/gnome/pixmaps/anjuta/appwid_pack.xpm
>-share/gnome/pixmaps/anjuta/appwid_page.xpm
>-share/gnome/pixmaps/anjuta/appwid_page1.xpm
>-share/gnome/pixmaps/anjuta/appwid_penguin.xpm
>-share/gnome/pixmaps/anjuta/appwid_sheet.xpm
>-share/gnome/pixmaps/anjuta/appwid_wid.xpm
>-share/gnome/pixmaps/anjuta/appwid_www.xpm
>+share/gnome/pixmaps/anjuta/applogo.png
>+share/gnome/pixmaps/anjuta/appwiz_bonobo.png
>+share/gnome/pixmaps/anjuta/appwiz_gnome.png
>+share/gnome/pixmaps/anjuta/appwiz_gnomemm.png
>+share/gnome/pixmaps/anjuta/appwiz_gtk.png
>+share/gnome/pixmaps/anjuta/appwiz_gtkmm.png
>+share/gnome/pixmaps/anjuta/appwiz_libglade.png
>+share/gnome/pixmaps/anjuta/appwiz_terminal.png
>+share/gnome/pixmaps/anjuta/appwizard.png
> share/gnome/pixmaps/anjuta/autocomplete.xpm
> share/gnome/pixmaps/anjuta/bfoldc.xpm
> share/gnome/pixmaps/anjuta/bfoldo.xpm
>@@ -211,7 +211,9 @@
> share/gnome/pixmaps/anjuta/build_all.xpm
> share/gnome/pixmaps/anjuta/build_stop.xpm
> share/gnome/pixmaps/anjuta/calltip.xpm
>+share/gnome/pixmaps/anjuta/cfolder.xpm
> share/gnome/pixmaps/anjuta/close_file.xpm
>+share/gnome/pixmaps/anjuta/close_file_small.xpm
> share/gnome/pixmaps/anjuta/close_project.xpm
> share/gnome/pixmaps/anjuta/compile.xpm
> share/gnome/pixmaps/anjuta/configure.xpm
>@@ -239,7 +241,11 @@
> share/gnome/pixmaps/anjuta/fold_open.xpm
> share/gnome/pixmaps/anjuta/fold_toggle.xpm
> share/gnome/pixmaps/anjuta/frame.xpm
>-share/gnome/pixmaps/anjuta/gear.xpm
>+share/gnome/pixmaps/anjuta/fv_core.xpm
>+share/gnome/pixmaps/anjuta/fv_exec.xpm
>+share/gnome/pixmaps/anjuta/fv_image.xpm
>+share/gnome/pixmaps/anjuta/fv_text.xpm
>+share/gnome/pixmaps/anjuta/fv_unknown.xpm
> share/gnome/pixmaps/anjuta/goto.xpm
> share/gnome/pixmaps/anjuta/graph.xpm
> share/gnome/pixmaps/anjuta/handle_hide.xpm
>@@ -251,7 +257,6 @@
> share/gnome/pixmaps/anjuta/indent_inc.xpm
> share/gnome/pixmaps/anjuta/indent_set.xpm
> share/gnome/pixmaps/anjuta/inspect.xpm
>-share/gnome/pixmaps/anjuta/interface.xpm
> share/gnome/pixmaps/anjuta/interrupt.xpm
> share/gnome/pixmaps/anjuta/ledgreen.xpm
> share/gnome/pixmaps/anjuta/ledred.xpm
>@@ -267,7 +272,9 @@
> share/gnome/pixmaps/anjuta/mini_dock.xpm
> share/gnome/pixmaps/anjuta/mini_find.xpm
> share/gnome/pixmaps/anjuta/mini_locals.xpm
>+share/gnome/pixmaps/anjuta/mini_term.xpm
> share/gnome/pixmaps/anjuta/new_file.xpm
>+share/gnome/pixmaps/anjuta/ofolder.xpm
> share/gnome/pixmaps/anjuta/open_file.xpm
> share/gnome/pixmaps/anjuta/open_project.xpm
> share/gnome/pixmaps/anjuta/paste.xpm
>@@ -291,6 +298,20 @@
> share/gnome/pixmaps/anjuta/step_out.xpm
> share/gnome/pixmaps/anjuta/step_over.xpm
> share/gnome/pixmaps/anjuta/stop.xpm
>+share/gnome/pixmaps/anjuta/sv_class.xpm
>+share/gnome/pixmaps/anjuta/sv_function.xpm
>+share/gnome/pixmaps/anjuta/sv_macro.xpm
>+share/gnome/pixmaps/anjuta/sv_private_fun.xpm
>+share/gnome/pixmaps/anjuta/sv_private_var.xpm
>+share/gnome/pixmaps/anjuta/sv_protected_fun.xpm
>+share/gnome/pixmaps/anjuta/sv_protected_var.xpm
>+share/gnome/pixmaps/anjuta/sv_public_fun.xpm
>+share/gnome/pixmaps/anjuta/sv_public_var.xpm
>+share/gnome/pixmaps/anjuta/sv_static_fun.xpm
>+share/gnome/pixmaps/anjuta/sv_static_var.xpm
>+share/gnome/pixmaps/anjuta/sv_struct.xpm
>+share/gnome/pixmaps/anjuta/sv_unknown.xpm
>+share/gnome/pixmaps/anjuta/sv_variable.xpm
> share/gnome/pixmaps/anjuta/syntax.xpm
> share/gnome/pixmaps/anjuta/undo.xpm
> share/gnome/pixmaps/anjuta/undock.xpm
>@@ -312,6 +333,7 @@
> share/locale/uk/LC_MESSAGES/anjuta.mo
> share/locale/zh_CN/LC_MESSAGES/anjuta.mo
> share/locale/zh_TW/LC_MESSAGES/anjuta.mo
>+@dirrm lib/anjuta
> @dirrm share/gnome/pixmaps/anjuta
> @dirrm share/gnome/omf/anjuta
> @dirrm share/gnome/help/anjuta/C/anjuta-manual/stylesheet-images
>@@ -323,4 +345,5 @@
> @dirrm share/gnome/help/anjuta/C
> @dirrm share/gnome/help/anjuta
> @dirrm share/gnome/anjuta/gnome
>+@dirrm share/gnome/anjuta/properties
> @dirrm share/gnome/anjuta
>--- files/patch-Makefile.in.orig	Fri Feb 15 18:04:51 2002
>+++ files/patch-Makefile.in	Fri Feb 15 17:34:03 2002
>@@ -1,23 +1,23 @@
>-
>-$FreeBSD: ports/devel/anjuta/files/patch-Makefile.in,v 1.3 2002/01/04 14:36:22 sobomax Exp $
>-
>---- Makefile.in.orig	Fri Jan  4 16:09:11 2002
>-+++ Makefile.in	Fri Jan  4 16:26:58 2002
>-@@ -137,11 +137,11 @@
>+--- Makefile.in.orig	Fri Feb 15 17:25:54 2002
>++++ Makefile.in	Fri Feb 15 17:33:47 2002
>+@@ -150,13 +150,13 @@
>  cxxflags_set = @cxxflags_set@
>  l = @l@
>  
>--SUBDIRS = intl po macros tagmanager global-tags scintilla ccview 	widgets manuals omf-install src pixmaps data 	doc launcher
>-+SUBDIRS = intl po macros tagmanager global-tags ccview 	widgets manuals omf-install src pixmaps data 	launcher
>+-SUBDIRS = intl po macros tagmanager global-tags scintilla \
>++SUBDIRS = intl po macros tagmanager global-tags \
>+ 	widgets manuals omf-install src pixmaps data \
>+-	doc launcher plugins scripts
>++	launcher plugins scripts
>  
>  
>  anjutadocdir = ${prefix}/doc/anjuta
>--anjutadoc_DATA =  	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
>-+anjutadoc_DATA = # 	README 	COPYING 	AUTHORS 	ChangeLog 	INSTALL 	NEWS 	TODO 	ABOUT-NLS 	FUTURE
>- 
>- 
>- EXTRA_DIST =  	anjuta.desktop.in.in 	anjuta.spec.in 	xml-i18n-extract.in 	xml-i18n-merge.in 	xml-i18n-update.in 	$(anjutadoc_DATA)
>-@@ -416,7 +416,7 @@
>+-anjutadoc_DATA = \
>++anjutadoc_DATA = # \
>+ 	README\
>+ 	COPYING\
>+ 	AUTHORS\
>+@@ -448,7 +448,7 @@
>  install-exec-am:
>  install-exec: install-exec-recursive
>  
>--- files/patch-configure.orig	Fri Feb 15 18:05:01 2002
>+++ files/patch-configure	Thu Feb 14 22:16:07 2002
>@@ -1,8 +1,5 @@
>-
>-$FreeBSD: ports/devel/anjuta/files/patch-configure,v 1.4 2002/01/04 14:36:22 sobomax Exp $
>-
>---- configure.orig	Fri Jan  4 15:39:12 2002
>-+++ configure	Fri Jan  4 16:07:50 2002
>+--- configure.orig	Thu Feb 14 22:13:15 2002
>++++ configure	Thu Feb 14 22:15:54 2002
> @@ -8,6 +8,7 @@
>  # gives unlimited permission to copy, distribute and modify it.
>  
>@@ -11,7 +8,7 @@
>  ac_help=
>  ac_default_prefix=/usr/local
>  # Any additions from configure.in:
>-@@ -6391,10 +6392,10 @@
>+@@ -10328,11 +10329,11 @@
>    packageprefix=${prefix}
>  fi
>  
>@@ -19,18 +16,18 @@
> -packagedocdir=doc/${PACKAGE}
> +packagedatadir=share/gnome/${PACKAGE}
> +packagedocdir=share/doc/${PACKAGE}
>+ packageplugindir=lib/${PACKAGE}/plugins/${VERSION}
>  
> -packagepixmapsdir=share/pixmaps/${PACKAGE}
> +packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
>  packagehelpdir=share/gnome/help/${PACKAGE}
>  packagemenudir=share/gnome/apps
>- 
>-@@ -6557,12 +6558,10 @@
>+ packageplugindir=lib/${PACKAGE}
>+@@ -10505,11 +10506,9 @@
>  tagmanager/Makefile
>  tagmanager/include/Makefile
>  global-tags/Makefile
> -scintilla/Makefile
>- ccview/Makefile
>  widgets/Makefile
>  manuals/Makefile
>  omf-install/Makefile
>@@ -38,20 +35,19 @@
>  manuals/C/Makefile
>  manuals/C/anjuta-manual/Makefile
>  manuals/C/anjuta-faqs/Makefile
>-@@ -6656,6 +6655,7 @@
>+@@ -10625,6 +10624,7 @@
>+ s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
>  s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
>  s%@cflags_set@%$cflags_set%g
>- s%@GTK_CONFIG@%$GTK_CONFIG%g
> +s%@GLIB_CONFIG@%$GLIB_CONFIG%g
>+ s%@GTK_CONFIG@%$GTK_CONFIG%g
>  s%@GTK_CFLAGS@%$GTK_CFLAGS%g
>  s%@GTK_LIBS@%$GTK_LIBS%g
>- s%@XPM_LIBS@%$XPM_LIBS%g
>-@@ -6759,12 +6759,10 @@
>+@@ -10730,11 +10730,9 @@
>  tagmanager/Makefile
>  tagmanager/include/Makefile
>  global-tags/Makefile
> -scintilla/Makefile
>- ccview/Makefile
>  widgets/Makefile
>  manuals/Makefile
>  omf-install/Makefile
>--- files/patch-doc-Makefile.in.orig	Fri Feb 15 18:05:24 2002
>+++ files/patch-doc-Makefile.in	Fri Feb 15 16:33:59 2002
>@@ -1,10 +1,11 @@
>---- doc/Makefile.in.orig	Sat Mar 31 00:14:22 2001
>-+++ doc/Makefile.in	Sat Mar 31 00:24:25 2001
>-@@ -112,7 +112,7 @@
>+--- doc/Makefile.in.orig	Thu Feb 14 22:16:50 2002
>++++ doc/Makefile.in	Thu Feb 14 22:17:06 2002
>+@@ -152,8 +152,7 @@
>  
>- anjuta_docdir = ${prefix}/doc/anjuta
>+ anjuta_docdir = $(prefix)/@NO_PREFIX_PACKAGE_DOC_DIR@
>  
>--anjuta_doc_DATA =  	ScintillaDoc.html
>+-anjuta_doc_DATA = \
>+-	ScintillaDoc.html
> +anjuta_doc_DATA =
>  
>  
>--- files/patch-launcher-Makefile.in.orig	Fri Feb 15 18:05:34 2002
>+++ files/patch-launcher-Makefile.in	Fri Feb 15 16:34:11 2002
>@@ -1,5 +1,5 @@
>---- launcher/Makefile.in.orig	Thu Mar 29 15:54:01 2001
>-+++ launcher/Makefile.in	Thu Mar 29 15:54:45 2001
>+--- launcher/Makefile.in.orig	Thu Feb 14 22:17:29 2002
>++++ launcher/Makefile.in	Thu Feb 14 22:18:22 2002
> @@ -12,6 +12,7 @@
>  
>  
>@@ -8,7 +8,7 @@
>  
>  srcdir = @srcdir@
>  top_srcdir = @top_srcdir@
>-@@ -110,13 +111,13 @@
>+@@ -150,13 +151,13 @@
>  cxxflags_set = @cxxflags_set@
>  l = @l@
>  
>@@ -20,7 +20,7 @@
>  anjuta_launcher_SOURCES = anjuta_launcher.c
>  
> -anjuta_launcher_LDFLAGS = `glib-config --libs` 
>-+anjuta_launcher_LDFLAGS = `$(GLIB_CONFIG) --libs` 
>++anjuta_launcher_LDFLAGS = `$(GLIB_CONFIG) --libs`
>  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>  CONFIG_HEADER = ../config.h
>  CONFIG_CLEAN_FILES = 
>--- files/patch-src-Makefile.in.orig	Fri Feb 15 18:05:48 2002
>+++ files/patch-src-Makefile.in	Fri Feb 15 17:03:46 2002
>@@ -1,33 +1,73 @@
>-
>-$FreeBSD: ports/devel/anjuta/files/patch-src-Makefile.in,v 1.4 2002/01/04 14:36:22 sobomax Exp $
>-
>---- src/Makefile.in.orig	Fri Jan  4 15:15:40 2002
>-+++ src/Makefile.in	Fri Jan  4 15:15:54 2002
>-@@ -139,10 +139,10 @@
>- 
>- EXTRA_DIST = glades.h Prj-skelimpl.c Prj-skels.c Prj-stubs.c
>- 
>--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(srcdir)/../scintilla/include 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes  	-O1  	-g
>-+INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	$(EXTRA_GNOME_CFLAGS) 	$(EXTRA_ORBIT_CFLAGS) 	-I$(prefix)/include/scintilla 	-I$(srcdir)/../tagmanager/include 	-I$(srcdir)/../widgets 	-I$(srcdir)/../ccview 	-I$(srcdir)/../pixmaps 	-I.. -I. 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment 	-Wuninitialized -Wparentheses -Wpointer-arith 	-Wmissing-prototypes
>- 
>- 
>--SCILEXERS =      ../scintilla/StyleContext.o 	../scintilla/LexCPP.o 	../scintilla/LexConf.o 	../scintilla/LexHTML.o 	../scintilla/LexLua.o 	../scintilla/LexOthers.o 	../scintilla/LexPerl.o 	../scintilla/LexPython.o 	../scintilla/LexSQL.o 	../scintilla/LexVB.o 	../scintilla/LexPascal.o 	../scintilla/LexAVE.o 	../scintilla/LexCrontab.o 	../scintilla/LexEiffel.o 	../scintilla/LexLisp.o 	../scintilla/LexRuby.o 	../scintilla/LexBullant.o 	../scintilla/LexAda.o
>-+SCILEXERS =      -lscintilla_lexers
>+--- src/Makefile.in.orig	Fri Feb 15 17:01:26 2002
>++++ src/Makefile.in	Fri Feb 15 17:03:35 2002
>+@@ -157,38 +157,17 @@
>+ 	$(GNOME_INCLUDEDIR)\
>+ 	$(EXTRA_GNOME_CFLAGS)\
>+ 	$(EXTRA_ORBIT_CFLAGS)\
>+-	-I$(srcdir)/../scintilla/include \
>++	-I$(prefix)/include/scintilla \
>+ 	-I$(srcdir)/../tagmanager/include \
>+ 	-I$(srcdir)/../widgets \
>+ 	-I$(srcdir)/../pixmaps \
>+ 	-I.. -I. \
>+ 	-Wall -Wimplicit -Wreturn-type -Wunused -Wswitch -Wcomment\
>+ 	-Wuninitialized -Wparentheses -Wpointer-arith\
>+-	-Wmissing-prototypes\
>+- 	-O1\
>+- 	-g
>++	-Wmissing-prototypes
>+ 
>+-
>+-SCILEXERS = \
>+-    ../scintilla/StyleContext.o\
>+-	../scintilla/LexCPP.o\
>+-	../scintilla/LexConf.o\
>+-	../scintilla/LexHTML.o\
>+-	../scintilla/LexLua.o\
>+-	../scintilla/LexOthers.o\
>+-	../scintilla/LexPerl.o\
>+-	../scintilla/LexPython.o\
>+-	../scintilla/LexSQL.o\
>+-	../scintilla/LexVB.o\
>+-	../scintilla/LexPascal.o\
>+-	../scintilla/LexAVE.o\
>+-	../scintilla/LexCrontab.o\
>+-	../scintilla/LexEiffel.o\
>+-	../scintilla/LexLisp.o\
>+-	../scintilla/LexRuby.o\
>+-	../scintilla/LexBullant.o\
>+-	../scintilla/LexAda.o\
>+-	../scintilla/LexBaan.o
>++SCILEXERS =		 -lscintilla_lexers
>++SCINTILLA =		 -lscintilla
>  
>  
>  bin_PROGRAMS = anjuta
>-@@ -198,14 +198,7 @@
>- defaults.$(OBJEXT) resources.$(OBJEXT) notebook.$(OBJEXT) \
>+@@ -387,9 +366,9 @@
>+ 	$(GNOMEUI_LIBS)\
>+ 	$(EXTRA_GNOME_LIBS)\
>+ 	$(EXTRA_ORBIT_LIBS)\
>+-	$(top_builddir)/scintilla/libscintilla.a\
>+ 	$(top_builddir)/tagmanager/libctags.a\
>+ 	$(top_builddir)/widgets/libwidgets.a\
>++	$(SCINTILLA)\
>+ 	$(SCILEXERS)
>+ 
>+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>+@@ -441,16 +420,7 @@
>+ compatibility_0.$(OBJEXT) defaults.$(OBJEXT) resources.$(OBJEXT) \
>  CORBA-Server.$(OBJEXT) Gladen-common.$(OBJEXT) glades.$(OBJEXT) \
>  Prj-common.$(OBJEXT) Gladen-stubs.$(OBJEXT) session.$(OBJEXT)
>--anjuta_DEPENDENCIES =  ../scintilla/StyleContext.o ../scintilla/LexCPP.o \
>--../scintilla/LexConf.o ../scintilla/LexHTML.o ../scintilla/LexLua.o \
>--../scintilla/LexOthers.o ../scintilla/LexPerl.o \
>+-anjuta_DEPENDENCIES =  $(top_builddir)/scintilla/libscintilla.a \
>+-$(top_builddir)/tagmanager/libctags.a \
>+-$(top_builddir)/widgets/libwidgets.a ../scintilla/StyleContext.o \
>+-../scintilla/LexCPP.o ../scintilla/LexConf.o ../scintilla/LexHTML.o \
>+-../scintilla/LexLua.o ../scintilla/LexOthers.o ../scintilla/LexPerl.o \
> -../scintilla/LexPython.o ../scintilla/LexSQL.o ../scintilla/LexVB.o \
> -../scintilla/LexPascal.o ../scintilla/LexAVE.o \
> -../scintilla/LexCrontab.o ../scintilla/LexEiffel.o \
> -../scintilla/LexLisp.o ../scintilla/LexRuby.o ../scintilla/LexBullant.o \
>--../scintilla/LexAda.o
>+-../scintilla/LexAda.o ../scintilla/LexBaan.o
> +anjuta_DEPENDENCIES =
>  anjuta_LDFLAGS = 
>  CXXFLAGS = @CXXFLAGS@

Actions: View | Diff

Attachments on bug 34983: 19707 | 19708 | 19709 | 19710