14 files changed, 226 insertions, 22 deletions

diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index 70ed9166c720..3a8118a27201 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -16,31 +16,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNOME 3D modeler
 
-LIB_DEPENDS=	gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
+LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-USE_GNOME=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
+USE_AUTOMAKE_VER=	14
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_FLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
+		AUTOHEADER="${TRUE}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 500000
-BROKEN=		"Does not compile"
-.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'
-	@${REINPLACE_CMD} -e "s,Bison ,Bison,g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s,-lgthread,-lgthread12,g ; \
-		s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/src/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/truevision/files/patch-configure.in b/graphics/truevision/files/patch-configure.in
new file mode 100644
index 000000000000..9e3382d8723c
--- /dev/null
+++ b/graphics/truevision/files/patch-configure.in
@@ -0,0 +1,22 @@
+--- configure.in.orig	Tue Jan  1 20:43:00 2002
++++ configure.in	Thu Jun 26 08:04:43 2003
+@@ -18,7 +18,7 @@
+ AC_HEADER_STDC
+ GNOME_COMPILE_WARNINGS
+ GNOME_X_CHECKS
+-GNOME_PTHREAD_CHECK
++AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(GTK not installed, or gtk-config not in path),gthread)
+ 
+ 
+ dnl***********************************************
+@@ -124,8 +124,8 @@
+ dnl*************************************************
+ dnl Libraries
+ dnl*************************************************
+-CXXFLAGS="$CXXFLAGS $GTK_CFLAGS $GL_CFLAGS $Z_CFLAGS $GTKGL_CFLAGS -I/usr/local/include"
+-LIBS="$LIBS $GL_LIBS $Z_LIBS $GTKGL_LDOPTS -L/usr/local/lib"
++CXXFLAGS="$CXXFLAGS $GTK_CFLAGS $GL_CFLAGS $Z_CFLAGS $GTKGL_CFLAGS"
++LIBS="$LIBS $GL_LIBS $Z_LIBS $GTKGL_LDOPTS"
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LIBS)
+ 
diff --git a/graphics/truevision/files/patch-src::Makefile.am b/graphics/truevision/files/patch-src::Makefile.am
new file mode 100644
index 000000000000..e213f4d70343
--- /dev/null
+++ b/graphics/truevision/files/patch-src::Makefile.am
@@ -0,0 +1,21 @@
+--- src/Makefile.am.orig	Tue Jan  1 20:43:01 2002
++++ src/Makefile.am	Thu Jun 26 08:27:48 2003
+@@ -1,11 +1,9 @@
+ ## Process this file with automake to produce Makefile.in
+-localedir = @datadir@/locale
+-datadir = @datadir@/@PACKAGE@
+-
+ INCLUDES = \
+ 	-I$(top_srcdir)/intl \
+ 	-I$(top_srcdir) \
+ 	$(GNOME_INCLUDEDIR) \
++	$(GTK_CFLAGS) \
+ 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -D_REENTRANT
+ 
+ bin_PROGRAMS = truevision
+@@ -58,4 +56,4 @@
+ 	undo.h undo.cc
+ 
+ truevision_LDFLAGS = -s
+-truevision_LDADD =  $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lgthread -lpthread $(INTLLIBS) @LIBS@
++truevision_LDADD =  $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(GTK_LIBS) $(INTLLIBS) @LIBS@
diff --git a/graphics/truevision/files/patch-src::density.cc b/graphics/truevision/files/patch-src::density.cc
new file mode 100644
index 000000000000..e9601a263a66
--- /dev/null
+++ b/graphics/truevision/files/patch-src::density.cc
@@ -0,0 +1,29 @@
+--- src/density.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/density.cc	Thu Jun 26 02:41:35 2003
+@@ -49,7 +49,7 @@
+ //**************************************
+ // Constructeur
+ //**************************************
+-PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true ) : MaterialItem( app_ref )
++PovTexDensity::PovTexDensity( app_objs *appref, void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top ) : MaterialItem( app_ref )
+ {
+ num = ++count;
+ char text[25];
+@@ -74,7 +74,7 @@
+ warp = new TvWidget_warp_rb( N_("Warp"), "WARP", NULL, app_ref );
+ }
+ 
+-void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top=true )
++void PovTexDensity::set_params( void (*asuicidal_func)(gpointer, gpointer), gpointer amother, bool is_top )
+ {
+ suicidal_func = asuicidal_func;
+ mother = amother;
+@@ -337,7 +337,7 @@
+ if ( map_editor != NULL ) map_editor->flush();
+ }
+ 
+-void PovTexDensity::output_to_povray( ofstream & file, bool inmap = false )
++void PovTexDensity::output_to_povray( ofstream & file, bool inmap )
+ {
+ if ( !inmap ) file << "\n\t\t\tdensity {\n\t\t\t\t";
+ 
diff --git a/graphics/truevision/files/patch-src::dlgutils.cc b/graphics/truevision/files/patch-src::dlgutils.cc
new file mode 100644
index 000000000000..0f241321406f
--- /dev/null
+++ b/graphics/truevision/files/patch-src::dlgutils.cc
@@ -0,0 +1,11 @@
+--- src/dlgutils.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/dlgutils.cc	Thu Jun 26 02:27:31 2003
+@@ -41,7 +41,7 @@
+ }
+ 
+ // Double box
+-GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed = false )
++GtkWidget *dlg_double_box( GtkWidget *parent, GtkWidget* &vbox1, GtkWidget* &vbox2, bool packed )
+ {
+ GtkWidget *hbox = gtk_hbox_new( TRUE, 5 );
+ if ( packed ) gtk_box_pack_start( GTK_BOX(parent), hbox, TRUE, TRUE, 1 );
diff --git a/graphics/truevision/files/patch-src::mapedit.cc b/graphics/truevision/files/patch-src::mapedit.cc
new file mode 100644
index 000000000000..a8e7facd9d1d
--- /dev/null
+++ b/graphics/truevision/files/patch-src::mapedit.cc
@@ -0,0 +1,11 @@
+--- src/mapedit.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/mapedit.cc	Thu Jun 26 02:26:27 2003
+@@ -28,7 +28,7 @@
+ //********************************************
+ // MAP ITEM
+ //********************************************
+-MapItem::MapItem( char *nom, float val = -1 )
++MapItem::MapItem( char *nom, float val )
+ {
+ name = nom;
+ value = val;
diff --git a/graphics/truevision/files/patch-src::material.cc b/graphics/truevision/files/patch-src::material.cc
new file mode 100644
index 000000000000..ec117acb7da7
--- /dev/null
+++ b/graphics/truevision/files/patch-src::material.cc
@@ -0,0 +1,20 @@
+--- src/material.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/material.cc	Thu Jun 26 02:34:41 2003
+@@ -66,7 +66,7 @@
+ //**************************************
+ // Add to list
+ //**************************************
+-void Material::add_to_list( GtkWidget *list, int position = -1 )
++void Material::add_to_list( GtkWidget *list, int position )
+ {
+ clist = GTK_CLIST( list );
+ gchar *titre[] = { name->value() };
+@@ -182,7 +182,7 @@
+ item_type = ref.item_type;
+ }
+ 
+-void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling = NULL )
++void MaterialItem::add_to_tree( GtkCTree *tree, GtkCTreeNode *node , GtkCTreeNode *sibling )
+ {
+ ctree = tree;
+ parent_node = node;
diff --git a/graphics/truevision/files/patch-src::matpov.cc b/graphics/truevision/files/patch-src::matpov.cc
new file mode 100644
index 000000000000..06ad76b7e4ef
--- /dev/null
+++ b/graphics/truevision/files/patch-src::matpov.cc
@@ -0,0 +1,11 @@
+--- src/matpov.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/matpov.cc	Thu Jun 26 02:35:44 2003
+@@ -600,7 +600,7 @@
+ }
+ 
+ 
+-void PovTexture::output_to_povray( ofstream & file, bool inmap = false )
++void PovTexture::output_to_povray( ofstream & file, bool inmap )
+ {
+ //if ( !is_used() ) return;
+ 
diff --git a/graphics/truevision/files/patch-src::texnormal.cc b/graphics/truevision/files/patch-src::texnormal.cc
new file mode 100644
index 000000000000..f891e1212d25
--- /dev/null
+++ b/graphics/truevision/files/patch-src::texnormal.cc
@@ -0,0 +1,11 @@
+--- src/texnormal.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/texnormal.cc	Thu Jun 26 02:38:59 2003
+@@ -44,7 +44,7 @@
+ //**************************************
+ // Constructeurs & Destructeurs
+ //**************************************
+-PovTexNormal::PovTexNormal( app_objs *appref, bool mother = true ) : MaterialItem( app_ref )
++PovTexNormal::PovTexNormal( app_objs *appref, bool mother ) : MaterialItem( app_ref )
+ {
+ set_name( _("Normal") );
+ item_type = TV_MITEM_NORMAL;
diff --git a/graphics/truevision/files/patch-src::texpigment.cc b/graphics/truevision/files/patch-src::texpigment.cc
new file mode 100644
index 000000000000..cc2525c1d6ee
--- /dev/null
+++ b/graphics/truevision/files/patch-src::texpigment.cc
@@ -0,0 +1,20 @@
+--- src/texpigment.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/texpigment.cc	Thu Jun 26 06:28:11 2003
+@@ -48,7 +48,7 @@
+ //**************************************
+ // Constructeur
+ //**************************************
+-PovTexPigment::PovTexPigment( app_objs *appref, bool mother = true ) : MaterialItem( appref )
++PovTexPigment::PovTexPigment( app_objs *appref, bool mother ) : MaterialItem( appref )
+ {
+ set_name( _("Pigment") );
+ item_type = TV_MITEM_PIGMENT;
+@@ -373,7 +373,7 @@
+ }
+ 
+ 
+-void PovTexPigment::output_to_povray( ofstream & file, bool in_map=false )
++void PovTexPigment::output_to_povray( ofstream & file, bool in_map )
+ {
+ if ( !used->value() ) return;
+ if ( !in_map ) file << "\n\t\tpigment {\n\t\t\t";
diff --git a/graphics/truevision/files/patch-src::tvwidgets.cc b/graphics/truevision/files/patch-src::tvwidgets.cc
new file mode 100644
index 000000000000..4efe7a282ebe
--- /dev/null
+++ b/graphics/truevision/files/patch-src::tvwidgets.cc
@@ -0,0 +1,11 @@
+--- src/tvwidgets.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/tvwidgets.cc	Thu Jun 26 02:23:39 2003
+@@ -56,7 +56,7 @@
+ in_update = false;
+ }
+ 
+-void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target=NULL )
++void TvWidget::pack_widget( GtkWidget *box, bool tt, GtkWidget *target )
+ {
+ if ( tt && tooltip != NULL ) 
+ 	{
diff --git a/graphics/truevision/files/patch-src::tvwidgets2.cc b/graphics/truevision/files/patch-src::tvwidgets2.cc
new file mode 100644
index 000000000000..4971be95273a
--- /dev/null
+++ b/graphics/truevision/files/patch-src::tvwidgets2.cc
@@ -0,0 +1,11 @@
+--- src/tvwidgets2.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/tvwidgets2.cc	Thu Jun 26 02:25:30 2003
+@@ -887,7 +887,7 @@
+ const char *bfiletype_ext[bfiletype_num] = { "df3" };
+ const char *bfiletype_def[bfiletype_num] = { " df3 " };
+ 
+-TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap = false )
++TvWidget_blendmap::TvWidget_blendmap(  const char *name, const char *sname, const char *tooltip, app_objs *appref, bool is_colmap )
+  : TvWidget( name, sname, tooltip, appref )
+ {
+ option_box = NULL;
diff --git a/graphics/truevision/files/patch-src::undo.cc b/graphics/truevision/files/patch-src::undo.cc
new file mode 100644
index 000000000000..5e467d7ff969
--- /dev/null
+++ b/graphics/truevision/files/patch-src::undo.cc
@@ -0,0 +1,29 @@
+--- src/undo.cc.orig	Tue Jan  1 20:43:01 2002
++++ src/undo.cc	Thu Jun 26 06:33:26 2003
+@@ -181,7 +181,7 @@
+ }
+ 
+ // Undo layers creation / deletion / move		
+-void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens = -1 )
++void UndoRedoManager::push( UndoAction act, ObjectLayer *lay, int sens )
+ {
+ UndoItem *item = new UndoItem( act, lay, sens );
+ UndoList.push_back( item );
+@@ -191,7 +191,7 @@
+ }
+ 
+ // Undo materials creation / deletion / move		
+-void UndoRedoManager::push( UndoAction act, Material *mat, int position = -1 )
++void UndoRedoManager::push( UndoAction act, Material *mat, int position )
+ {
+ UndoItem *item = new UndoItem( act, mat, position );
+ UndoList.push_back( item );
+@@ -231,7 +231,7 @@
+ // The main function used
+ // in fact it is also used for redo ;-)
+ //***************************************************
+-void UndoRedoManager::undo( bool doredo = false )
++void UndoRedoManager::undo( bool doredo )
+ {
+ // Define source & destination lists
+ // The determine if we act as undo or redo...
diff --git a/graphics/truevision/files/patch-src::undo.h b/graphics/truevision/files/patch-src::undo.h
new file mode 100644
index 000000000000..21c367fe5972
--- /dev/null
+++ b/graphics/truevision/files/patch-src::undo.h
@@ -0,0 +1,11 @@
+--- src/undo.h.orig	Tue Jan  1 20:43:01 2002
++++ src/undo.h	Thu Jun 26 02:21:52 2003
+@@ -65,7 +65,7 @@
+ // one for undo and the other for redo
+ //**********************************************************
+ class UndoItem {
+-	friend UndoRedoManager;
++	friend struct UndoRedoManager;
+ 
+ 	private:
+ 		UndoAction action;