- Update to 0.0.7 and unbreak

- Fix dependencies
- Respect C{C,XX} and C[XX]FLAGS
- Fix spelling typo in pkg-descr, kill dots/space at EOLs
- Utilize DATADIR in pkg-plist
- Take maintainership

15 files changed, 270 insertions, 90 deletions

diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 23015aa9ea19..4efbc4b006c2 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	titano
+# New ports collection makefile for:	Titano
 # Date created:				25 September 2000
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
@@ -6,40 +6,41 @@
 #
 
 PORTNAME=	titano
-PORTVERSION=	0.0.5b
-PORTREVISION=	2
+PORTVERSION=	0.0.7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An IDE for GNOME desktop
 
-LIB_DEPENDS=	gtkeditor.0:${PORTSDIR}/x11-toolkits/libgtkeditor
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
+LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_REINPLACE=	yes
-USE_GNOME=	gnomelibs
+USE_GNOME=	gnomelibs libglade
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	13
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile (bad C++ code)"
+.if ${OSVERSION} > 500034
+EXTRA_PATCHES+=	${FILESDIR}/gcc3-*
 .endif
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
-
-post-install:
-	${MKDIR} ${PREFIX}/share/gnome/pixmaps/titano
-	${INSTALL_DATA} ${WRKSRC}/src/xpm/* ${PREFIX}/share/gnome/pixmaps/titano
+pre-patch: .SILENT
+	${REINPLACE_CMD} -e 's|malloc\.h|stdlib\.h|' \
+		${WRKSRC}/src/scintilla/PosRegExp.cxx
+	${REINPLACE_CMD} -e 's|^INCLUDES.*$$|&$$(LIBGLADE_CFLAGS)|' \
+		${WRKSRC}/src/Makefile.in
+	${REINPLACE_CMD} -E 's|(POTFILES\.in )\\$$|\1--from-code=koi8-r \\|' \
+		${WRKSRC}/po/Makefile.in.in
+# Now, take care of CC/CFLAGS
+	${REINPLACE_CMD} -e 's|cc -Wall -ggdb $$(OPTIMIZE)|${CC} ${CFLAGS}|' \
+		${WRKSRC}/src/gtkeditor/tktext-port/Makefile
+	${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' \
+		${WRKSRC}/src/scanners/Makefile.in
+	${REINPLACE_CMD} -E 's|^(CXXFLAGS).*$$|\1 += -DGTK -DSCI_LEXER|' \
+		${WRKSRC}/src/scintilla/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/devel/titano/distinfo b/devel/titano/distinfo
index 3cdc5c7408b3..c30a8928f28e 100644
--- a/devel/titano/distinfo
+++ b/devel/titano/distinfo
@@ -1,2 +1,2 @@
-MD5 (titano-0.0.5b.tar.gz) = a83aff0532244de14e2c2f223e8b9482
-SIZE (titano-0.0.5b.tar.gz) = 414017
+MD5 (titano-0.0.7.tar.gz) = f886e314180c3eae524bf51521d79689
+SIZE (titano-0.0.7.tar.gz) = 751505
diff --git a/devel/titano/files/gcc3-patch-src_projects.cc b/devel/titano/files/gcc3-patch-src_projects.cc
new file mode 100644
index 000000000000..540d717a1135
--- /dev/null
+++ b/devel/titano/files/gcc3-patch-src_projects.cc
@@ -0,0 +1,22 @@
+--- src/projects.cc.orig	Sat Dec  9 23:13:32 2000
++++ src/projects.cc	Thu Apr  7 19:10:08 2005
+@@ -100,13 +100,13 @@
+ 	int pos = name.rfind('.');
+ 	
+ 	if(pos != name.npos){
+-		if(!name.compare(".h",pos,2))
++		if(!name.compare(pos,2,".h"))
+ 			res = C_HEADER;
+-		if(!name.compare(".c",pos,2)||
+-		   !name.compare(".C",pos,2)||
+-		   !name.compare(".cc",pos,3)||
+-		   !name.compare(".cpp",pos,4)||
+-		   !name.compare(".cxx",pos,4))
++		if(!name.compare(pos,2,".c")||
++		   !name.compare(pos,2,".C")||
++		   !name.compare(pos,3,".cc")||
++		   !name.compare(pos,4,".cpp")||
++		   !name.compare(pos,4,".cxx"))
+ 			res = C_SOURCE;
+ 	};
+ 
diff --git a/devel/titano/files/gcc3-patch-src_projects.h b/devel/titano/files/gcc3-patch-src_projects.h
new file mode 100644
index 000000000000..3b65f689dee2
--- /dev/null
+++ b/devel/titano/files/gcc3-patch-src_projects.h
@@ -0,0 +1,30 @@
+--- src/projects.h.orig	Sat Dec  9 22:57:49 2000
++++ src/projects.h	Thu Apr  7 17:30:36 2005
+@@ -21,22 +21,24 @@
+ #define _PROJECTS_H 
+ 
+ #include <string>
+-#include <hash_map>
++#include <ext/hash_map>
+ #include <list>
+ 
+ #include "dialogs.h"
+ #include "files.h"
+ 
++using namespace std;
++
+ struct str_hasher
+ {
+ 	size_t operator()(const string &str) const
+ 	{
+-		hash<char *> hasher;
++		__gnu_cxx::hash<char *> hasher;
+ 		return hasher(str.c_str());
+ 	};
+ };
+ 
+-typedef hash_map<string,File *,str_hasher> files_map;
++typedef __gnu_cxx::hash_map<string,File *,str_hasher> files_map;
+ typedef list<string> files_list;
+ 
+ typedef enum {UNKNOWN,C_HEADER,C_SOURCE} FileType;
diff --git a/devel/titano/files/gcc3-patch-src_titano-app.cc b/devel/titano/files/gcc3-patch-src_titano-app.cc
new file mode 100644
index 000000000000..add76ff8c7a0
--- /dev/null
+++ b/devel/titano/files/gcc3-patch-src_titano-app.cc
@@ -0,0 +1,11 @@
+--- src/titano-app.cc.orig	Fri Dec 29 19:52:11 2000
++++ src/titano-app.cc	Thu Apr  7 18:28:24 2005
+@@ -410,7 +410,7 @@
+ 
+ void TitanoApp::open_project(const string &filename)
+ {
+-	if(filename.rfind('.') == filename.npos || filename.compare(".titano",filename.rfind('.'),7)){
++	if(filename.rfind('.') == filename.npos || filename.compare(filename.rfind('.'),7,".titano")){
+ 		throw Exception("File " + filename + " is not a Titano project.");	       
+ 	};
+ 	
diff --git a/devel/titano/files/gcc3-patch-src_views.cc b/devel/titano/files/gcc3-patch-src_views.cc
new file mode 100644
index 000000000000..49d9bd025bdf
--- /dev/null
+++ b/devel/titano/files/gcc3-patch-src_views.cc
@@ -0,0 +1,21 @@
+--- src/views.cc.orig	Sat Dec 16 01:22:27 2000
++++ src/views.cc	Thu Apr  7 19:07:54 2005
+@@ -45,12 +45,12 @@
+ 	int pos = file.rfind('.');
+ 	
+ 	if(pos != file.npos){
+-		if(!file.compare(".h",pos,2)||
+-		   !file.compare(".c",pos,2)||
+-		   !file.compare(".C",pos,2)||
+-		   !file.compare(".cc",pos,3)||
+-		   !file.compare(".cpp",pos,4)||
+-		   !file.compare(".cxx",pos,4))
++		if(!file.compare(pos,2,".h")||
++		   !file.compare(pos,2,".c")||
++		   !file.compare(pos,2,".C")||
++		   !file.compare(pos,3,".cc")||
++		   !file.compare(pos,4,".cpp")||
++		   !file.compare(pos,4,".cxx"))
+ 		res = "cpp";
+ 	};
+ 
diff --git a/devel/titano/files/patch-aa b/devel/titano/files/patch-aa
deleted file mode 100644
index bb6ba07bb23e..000000000000
--- a/devel/titano/files/patch-aa
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/Makefile.in	2000/09/25 11:33:52	1.1
-+++ src/Makefile.in	2000/09/25 11:39:21
-@@ -124,9 +124,9 @@
- cxxflags_set = @cxxflags_set@
- l = @l@
- 
--SUBDIRS = gtkeditor tools scanners
-+SUBDIRS = #gtkeditor tools scanners
- 
--INCLUDES =  	-I$(top_srcdir)/intl 	$(GNOME_INCLUDEDIR) 	-I$(top_srcdir)/src/gtkeditor
-+INCLUDES =  	$(GNOME_INCLUDEDIR) 	-I$(X11BASE)/include
- 
- 
- EXTRA_DIST =  	run-tit 	xpm/save_all.xpm 	xpm/compile.xpm 	xpm/debug.xpm 	xpm/exec.xpm
-@@ -137,7 +137,7 @@
- titano_SOURCES =  	main.cc 	support.c support.h 	interface.c interface.h 	callbacks.cc callbacks.h 	common.cc common.h 	highlight.h 	files.cc files.h 	projects.cc projects.h 	dialogs.cc dialogs.h 	util.cc util.h 	cproject.cc 	prefs.cc prefs.h
- 
- 
--titano_LDADD = gtkeditor/libgtkeditor.la $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
-+titano_LDADD = -lgtkeditor $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
-@@ -148,7 +148,7 @@
- LIBS = @LIBS@
- titano_OBJECTS =  main.o support.o interface.o callbacks.o common.o \
- files.o projects.o dialogs.o util.o cproject.o prefs.o
--titano_DEPENDENCIES =  gtkeditor/libgtkeditor.la
-+titano_DEPENDENCIES =  # gtkeditor/libgtkeditor.la
- titano_LDFLAGS = 
- CXXFLAGS = @CXXFLAGS@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff --git a/devel/titano/files/patch-ab b/devel/titano/files/patch-ab
deleted file mode 100644
index cdc21a408f3e..000000000000
--- a/devel/titano/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/prefs.cc	2000/09/25 12:01:34	1.1
-+++ src/prefs.cc	2000/09/25 12:03:32
-@@ -8,6 +8,11 @@
- 
- Preferences::Preferences(void)
- {
-+	defaultdir=NULL;
-+	lastname=NULL;
-+	lastdir=NULL;
-+	name=NULL;
-+	mail=NULL;
- 	file = g_strconcat(home,"/.titano/titano",NULL);
- 	
- 	if(Preferences::check())
diff --git a/devel/titano/files/patch-ac b/devel/titano/files/patch-ac
deleted file mode 100644
index 5021d5800cc6..000000000000
--- a/devel/titano/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/cproject.cc	2000/09/25 13:46:43	1.1
-+++ src/cproject.cc	2000/09/25 13:50:01
-@@ -935,7 +935,7 @@
- 	if(!hilite){
- 		hilite = (HighlightSet *)malloc(sizeof(HighlightSet));
- 		
--		hilite->scanner = gtk_editor_load_scanner(path);
-+		hilite->scanner = gtk_editor_load_scanner("c-scanner");
- 	};		
- 
- 	g_free(path);
diff --git a/devel/titano/files/patch-src_automake.h b/devel/titano/files/patch-src_automake.h
new file mode 100644
index 000000000000..58d3be082f9f
--- /dev/null
+++ b/devel/titano/files/patch-src_automake.h
@@ -0,0 +1,14 @@
+--- src/automake.h.orig	Sat Dec 16 13:07:24 2000
++++ src/automake.h	Thu Apr  7 20:00:08 2005
+@@ -65,6 +65,11 @@
+ 	{
+ 		return target.name != str;
+ 	};
++
++	friend bool operator==(const Target &target,const string &str)
++	{
++		return target.name == str;
++	};
+ };
+ 
+ class Makefile
diff --git a/devel/titano/files/patch-src_conffile.h b/devel/titano/files/patch-src_conffile.h
new file mode 100644
index 000000000000..12b5d57593dc
--- /dev/null
+++ b/devel/titano/files/patch-src_conffile.h
@@ -0,0 +1,11 @@
+--- src/conffile.h.orig	Wed Nov  1 21:58:04 2000
++++ src/conffile.h	Thu Apr  7 19:55:13 2005
+@@ -23,6 +23,8 @@
+ #include <gnome.h>
+ #include <string>
+ 
++using namespace std;
++
+ class ConfFile
+ {
+ private:
diff --git a/devel/titano/files/patch-src_iexceptions.h b/devel/titano/files/patch-src_iexceptions.h
new file mode 100644
index 000000000000..055f422dcbab
--- /dev/null
+++ b/devel/titano/files/patch-src_iexceptions.h
@@ -0,0 +1,51 @@
+--- src/iexceptions.h.orig	Tue Sep 12 21:54:25 2000
++++ src/iexceptions.h	Thu Apr  7 17:37:27 2005
+@@ -24,6 +24,8 @@
+ #include <string>
+ #include <string.h>
+ 
++using namespace std;
++
+ class Exception : public exception
+ {
+ protected:
+@@ -33,6 +35,9 @@
+ 		message(msg)
+ 	{ };
+ 	
++	virtual ~Exception() throw()
++	{ };
++
+ 	virtual operator string()
+ 	{
+ 		return message;
+@@ -51,6 +56,9 @@
+ 		error(err)
+ 	{ };
+ 
++	virtual ~EIOError() throw()
++	{ };
++
+ 	virtual operator string()
+ 	{
+ 		return message + "\n" +
+@@ -71,6 +79,9 @@
+ 		reason(reas)
+ 	{ };
+ 
++	virtual ~ENotSupported() throw()
++	{ };
++
+ 	virtual operator string()
+ 	{
+ 		return message + "\n" +
+@@ -91,6 +102,9 @@
+ 		error(err)
+ 	{ };
+ 
++	virtual ~EShellError() throw()
++	{ };
++
+ 	virtual operator string()
+ 	{
+ 		return message + "\n" +
diff --git a/devel/titano/files/patch-src_prefs.cc b/devel/titano/files/patch-src_prefs.cc
new file mode 100644
index 000000000000..48b1f21ab9bb
--- /dev/null
+++ b/devel/titano/files/patch-src_prefs.cc
@@ -0,0 +1,25 @@
+--- src/prefs.cc.orig	Sat Dec  9 16:07:38 2000
++++ src/prefs.cc	Thu Apr  7 20:48:59 2005
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ #include "util.h"
+ #include "conffile.h"
+@@ -33,9 +34,13 @@
+ {
+ 	if(name.empty())
+ 		name = getenv("USER");
++		if (name.empty())
++			name = "nobody";
+ 	
+ 	if(mail.empty()){
+-		char *host = getenv("HOSTNAME");
++		char host[256];
++		if (gethostname(host, 256))
++			strncpy(host, "dev.null.org", 255);
+ 		mail = name + "@" + host;
+ 	};
+ 
diff --git a/devel/titano/pkg-descr b/devel/titano/pkg-descr
index 3beb5e543f15..0db2d86f0ea7 100644
--- a/devel/titano/pkg-descr
+++ b/devel/titano/pkg-descr
@@ -3,11 +3,11 @@ editing widget though you will be able to use your favorite editor as an
 editing component in Titano via Bonobo technology.
 
 Features (some of features are only planned and may appear not very soon):
- o Project managment with automake/autoconf support. 
- o Support for different languages. 
- o Bonobo editor components. 
- o Integrated debugger. 
- o Code exploring tools. 
- o And many other things you may need for developing. 
+ o Project management with automake/autoconf support
+ o Support for different languages
+ o Bonobo editor components
+ o Integrated debugger
+ o Code exploring tools
+ o And many other things you may need for developing
 
 WWW: http://titano.sourceforge.net/
diff --git a/devel/titano/pkg-plist b/devel/titano/pkg-plist
index b8d660199066..323d2fd5ecc2 100644
--- a/devel/titano/pkg-plist
+++ b/devel/titano/pkg-plist
@@ -1,6 +1,57 @@
+bin/scannertool
 bin/titano
-share/gnome/pixmaps/titano/compile.xpm
-share/gnome/pixmaps/titano/debug.xpm
-share/gnome/pixmaps/titano/exec.xpm
-share/gnome/pixmaps/titano/save_all.xpm
-@dirrm share/gnome/pixmaps/titano
+lib/titano/c-scanner.so
+lib/titano/html-scanner.so
+lib/titano/java-scanner.so
+lib/titano/perl-scanner.so
+lib/titano/scheme-scanner.so
+lib/titano/sml-scanner.so
+@dirrm lib/titano
+%%DATADIR%%/templates/cgtk.tar.gz
+%%DATADIR%%/templates/cppgtk.tar.gz
+%%DATADIR%%/templates/cgnome.tar.gz
+%%DATADIR%%/templates/cppgnome.tar.gz
+%%DATADIR%%/templates/cconsole.tar.gz
+%%DATADIR%%/templates/cppconsole.tar.gz
+%%DATADIR%%/templates/h_template
+%%DATADIR%%/templates/c_template
+%%DATADIR%%/scripts/project.pl
+%%DATADIR%%/scripts/file.pl
+%%DATADIR%%/scripts/amlist
+%%DATADIR%%/glade/add_file.xpm
+%%DATADIR%%/glade/autogen.xpm
+%%DATADIR%%/glade/close_file.xpm
+%%DATADIR%%/glade/code.xpm
+%%DATADIR%%/glade/compile.xpm
+%%DATADIR%%/glade/conf.xpm
+%%DATADIR%%/glade/copy.xpm
+%%DATADIR%%/glade/cut.xpm
+%%DATADIR%%/glade/debug.xpm
+%%DATADIR%%/glade/dir.xpm
+%%DATADIR%%/glade/dist.xpm
+%%DATADIR%%/glade/exec.xpm
+%%DATADIR%%/glade/make.xpm
+%%DATADIR%%/glade/new_file.xpm
+%%DATADIR%%/glade/open_proj.xpm
+%%DATADIR%%/glade/paste.xpm
+%%DATADIR%%/glade/process.xpm
+%%DATADIR%%/glade/project.xpm
+%%DATADIR%%/glade/redo.xpm
+%%DATADIR%%/glade/rem_file.xpm
+%%DATADIR%%/glade/save_all.xpm
+%%DATADIR%%/glade/save_file.xpm
+%%DATADIR%%/glade/save_proj.xpm
+%%DATADIR%%/glade/stderr.xpm
+%%DATADIR%%/glade/stdout.xpm
+%%DATADIR%%/glade/undo.xpm
+%%DATADIR%%/glade/titano.glade
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+share/pixmaps/titano/console.png
+share/pixmaps/titano/gnome.png
+share/pixmaps/titano/gtk.png
+share/pixmaps/titano/logo.png
+@dirrm share/pixmaps/titano
+share/gnome/apps/Development/titano.desktop