- Update to 6.0-pre12

PR:		ports/61173
Submitted by:	David Bremner <bremner@unb.ca> (maintainer)

9 files changed, 101 insertions, 753 deletions

diff --git a/graphics/ipe/files/patch-Ipe b/graphics/ipe/files/patch-Ipe
deleted file mode 100644
index 74134c46eb00..000000000000
--- a/graphics/ipe/files/patch-Ipe
+++ /dev/null
@@ -1,337 +0,0 @@
-diff -cr ../Ipe-5.0/Ipe/Makefile Ipe/Makefile
-*** ../Ipe-5.0/Ipe/Makefile	Thu Nov 27 16:09:18 1997
---- Ipe/Makefile	Sun Nov  5 14:51:33 2000
-***************
-*** 26,42 ****
-  
-  # define GFLAGS if you use g++
-  #GFLAGS  =
-! GFLAGS	= -fno-for-scope
-  
-  # Need to find X and Motif
-! INCLUDE_DIRS	= -I../Plageo -I/usr/local/include/Xm
-! LIB_DIRS	= -L../Plageo -L/usr/lib/X11R5 -L/usr/local/lib/
-  
-  # on a Dec Alpha, add -DNO_XMSTRINGS to CFLAGS
-  # if you get an error with signal handlers,
-  # add -DLONG_SIGNAL_HANDLER_ARG to CFLAGS
-! CFLAGS		= $(GFLAGS) -O $(MIXED) $(INCLUDE_DIRS)
-! LFLAGS		= $(LIB_DIRS) -s
-  
-  # LIBRARIES when linking the mixed model (SGI Irix 4)
-  # LIBRARIES	= -lXirisw -lXm -lXt -lfm_s -lgl_s -lPW -lplageo -lm
---- 26,42 ----
-  
-  # define GFLAGS if you use g++
-  #GFLAGS  =
-! GFLAGS	= -fno-for-scope  
-  
-  # Need to find X and Motif
-! INCLUDE_DIRS	= -I../Plageo -I/usr/X11R6/include
-! LIB_DIRS	= -L../Plageo -L/usr/X11R6/lib -L/usr/local/lib/
-  
-  # on a Dec Alpha, add -DNO_XMSTRINGS to CFLAGS
-  # if you get an error with signal handlers,
-  # add -DLONG_SIGNAL_HANDLER_ARG to CFLAGS
-! CFLAGS		= $(GFLAGS)  $(MIXED) $(INCLUDE_DIRS)
-! LFLAGS		= $(LIB_DIRS) 
-  
-  # LIBRARIES when linking the mixed model (SGI Irix 4)
-  # LIBRARIES	= -lXirisw -lXm -lXt -lfm_s -lgl_s -lPW -lplageo -lm
-***************
-*** 83,89 ****
-  all: $(EXE)
-  
-  $(EXE): $(OBJS) 
-! 	$(CC) $(OBJS) $(LFLAGS) $(LIBRARIES) -o $(EXE)
-  
-  .C.o:
-  	$(CC) $(CFLAGS) -c $<
---- 83,89 ----
-  all: $(EXE)
-  
-  $(EXE): $(OBJS) 
-! 	$(CC) -g $(OBJS) $(LFLAGS) $(LIBRARIES) -o $(EXE)
-  
-  .C.o:
-  	$(CC) $(CFLAGS) -c $<
-diff -cr ../Ipe-5.0/Ipe/advertise.h Ipe/advertise.h
-*** ../Ipe-5.0/Ipe/advertise.h	Tue May  9 04:35:59 1995
---- Ipe/advertise.h	Wed Oct 25 15:16:18 2000
-***************
-*** 155,161 ****
-  advertise void show_m_ipe(void);
-  advertise void show_operation(const char *op, const char *key);
-  advertise void create_widgets(void);
-! advertise void show_message(char *str1, char *str2);
-  advertise void show_choice(char *str,
-  		 char *but1, IpeCallback call1,
-  		 char *but2, IpeCallback call2,
---- 155,161 ----
-  advertise void show_m_ipe(void);
-  advertise void show_operation(const char *op, const char *key);
-  advertise void create_widgets(void);
-! advertise void show_message(const char *str1, const char *str2);
-  advertise void show_choice(char *str,
-  		 char *but1, IpeCallback call1,
-  		 char *but2, IpeCallback call2,
-***************
-*** 178,184 ****
-  advertise IpeButton enable_undo_bt, enable_latex_box_bt, enable_fifi_bt;
-  advertise IpeButton enable_interior_bt, enable_zoom_pan_bt, enable_stroke_bt;
-  advertise IpeButton enable_3_spline_bt;
-! advertise void set_ps_preamble(char *s);
-  advertise char *get_preamble(int which DefaultsTo(0));
-  advertise char *get_command(int which);
-  advertise void show_m_ipe_configuration(void);
---- 178,184 ----
-  advertise IpeButton enable_undo_bt, enable_latex_box_bt, enable_fifi_bt;
-  advertise IpeButton enable_interior_bt, enable_zoom_pan_bt, enable_stroke_bt;
-  advertise IpeButton enable_3_spline_bt;
-! advertise void set_ps_preamble(const char *s);
-  advertise char *get_preamble(int which DefaultsTo(0));
-  advertise char *get_command(int which);
-  advertise void show_m_ipe_configuration(void);
-***************
-*** 313,319 ****
-  // from file.C:
-  
-  advertise Boolean ps_save_picture(IpeCallback callback);
-! advertise Boolean ps_save_picture(char *fn DefaultsTo(filename),
-  				  int pagenum DefaultsTo(0),
-  				  Boolean force DefaultsTo(TRUE),
-  				  IpeCallback callback DefaultsTo(NIL));
---- 313,319 ----
-  // from file.C:
-  
-  advertise Boolean ps_save_picture(IpeCallback callback);
-! advertise Boolean ps_save_picture(const char *fn DefaultsTo(filename),
-  				  int pagenum DefaultsTo(0),
-  				  Boolean force DefaultsTo(TRUE),
-  				  IpeCallback callback DefaultsTo(NIL));
-diff -cr ../Ipe-5.0/Ipe/colors.C Ipe/colors.C
-*** ../Ipe-5.0/Ipe/colors.C	Tue May  9 04:36:03 1995
---- Ipe/colors.C	Thu Nov  2 15:31:19 2000
-***************
-*** 123,129 ****
-  // COLOR I/O
-  //
-  
-! void IColor::save(ostream& fh, char *save_ipe, char *save_ps)
-  // save color in file
-  {
-    if (!col)
---- 123,129 ----
-  // COLOR I/O
-  //
-  
-! void IColor::save(ostream& fh, const char *save_ipe, const char *save_ps)
-  // save color in file
-  {
-    if (!col)
-***************
-*** 409,414 ****
---- 409,420 ----
-    
-    // if less than 6 bits, give up and use b&w
-    
-+   if (!bestv[PseudoColor]){
-+     cerr << "No PseudoColor visuals found\n";
-+     monochrome=true;
-+     return;
-+   }
-+ 
-    if (bestv[PseudoColor]->depth < 6) {
-      monochrome = TRUE;
-      return;
-diff -cr ../Ipe-5.0/Ipe/configuration.C Ipe/configuration.C
-*** ../Ipe-5.0/Ipe/configuration.C	Tue May  9 04:36:04 1995
---- Ipe/configuration.C	Wed Oct 25 15:24:38 2000
-***************
-*** 52,60 ****
-  // SET and READOUT values
-  //
-  
-! advertise void set_ps_preamble(char *s)
-  {
-!   XmTextSetString(psPreamble, s);
-  }
-  
-  advertise char *get_preamble(int which DefaultsTo(0))
---- 52,60 ----
-  // SET and READOUT values
-  //
-  
-! advertise void set_ps_preamble(const char *s)
-  {
-!   XmTextSetString(psPreamble,(char *)(s));
-  }
-  
-  advertise char *get_preamble(int which DefaultsTo(0))
-diff -cr ../Ipe-5.0/Ipe/file.C Ipe/file.C
-*** ../Ipe-5.0/Ipe/file.C	Tue May  9 04:36:04 1995
---- Ipe/file.C	Wed Oct 25 15:12:03 2000
-***************
-*** 164,170 ****
-    return ps_save_picture(filename, 0, TRUE, callback);
-  }
-  
-! advertise Boolean ps_save_picture(char *fn DefaultsTo(filename),
-  				  int pagenum DefaultsTo(0),
-  				  Boolean force DefaultsTo(TRUE),
-  				  IpeCallback callback DefaultsTo(NIL))
---- 164,170 ----
-    return ps_save_picture(filename, 0, TRUE, callback);
-  }
-  
-! advertise Boolean ps_save_picture(const char *fn DefaultsTo(filename),
-  				  int pagenum DefaultsTo(0),
-  				  Boolean force DefaultsTo(TRUE),
-  				  IpeCallback callback DefaultsTo(NIL))
-diff -cr ../Ipe-5.0/Ipe/iface.h Ipe/iface.h
-*** ../Ipe-5.0/Ipe/iface.h	Tue May  9 04:35:59 1995
---- Ipe/iface.h	Wed Oct 25 15:19:34 2000
-***************
-*** 257,263 ****
-    void setcol(void);
-    void syscol(short);
-  
-!   void save(ostream&, char *ipe, char *ps);
-    void save_latex(ostream&);
-    void read(int);
-    
---- 257,263 ----
-    void setcol(void);
-    void syscol(short);
-  
-!   void save(ostream&, const char *ipe, const char *ps);
-    void save_latex(ostream&);
-    void read(int);
-    
-diff -cr ../Ipe-5.0/Ipe/interface.C Ipe/interface.C
-*** ../Ipe-5.0/Ipe/interface.C	Tue May  9 04:36:06 1995
---- Ipe/interface.C	Wed Oct 25 15:14:23 2000
-***************
-*** 751,757 ****
-  // Show a message in a popup window
-  //
-  
-! advertise void show_message(char *str1, char *str2)
-  // popup an (error) message window with one or two lines of text
-  // window stays, and is removed by its OK button
-  {
---- 751,757 ----
-  // Show a message in a popup window
-  //
-  
-! advertise void show_message(const char *str1, const char *str2)
-  // popup an (error) message window with one or two lines of text
-  // window stays, and is removed by its OK button
-  {
-diff -cr ../Ipe-5.0/Ipe/itypes.h Ipe/itypes.h
-*** ../Ipe-5.0/Ipe/itypes.h	Tue May  9 04:36:00 1995
---- Ipe/itypes.h	Wed Oct 25 11:32:14 2000
-***************
-*** 52,58 ****
-  enum Object_type { TEXT, SPLINE, LINE, MARK, SPLINEGON, POLYGON, ARC,
-  		   BOX, CIRCLE, BITMAP, GROUP, SEGMENTS};
-  
-! const NUM_OBJECT_TYPES = 9;
-  
-  // ============================================================
-  
---- 52,58 ----
-  enum Object_type { TEXT, SPLINE, LINE, MARK, SPLINEGON, POLYGON, ARC,
-  		   BOX, CIRCLE, BITMAP, GROUP, SEGMENTS};
-  
-! const int NUM_OBJECT_TYPES = 9;
-  
-  // ============================================================
-  
-diff -cr ../Ipe-5.0/Ipe/preview.C Ipe/preview.C
-*** ../Ipe-5.0/Ipe/preview.C	Sat Dec 20 11:16:43 1997
---- Ipe/preview.C	Fri Oct 27 14:18:51 2000
-***************
-*** 215,223 ****
-  	sprintf(buf, "-g%dx%d", canvas_size.x, canvas_size.y);
-  	DEBUG(DBG_GS, "Starting Ghostscript", buf);
-  	if (app.debug & DBG_GS)
-! 	  execl(app.ghostscript_name, "gs", buf, "-r72", NIL);
-  	else
-! 	  execl(app.ghostscript_name, "gs", buf, "-r72", "-q", NIL);
-  	cerr << "could not start ghostscript\n";
-  	exit(1);
-        }
---- 215,223 ----
-  	sprintf(buf, "-g%dx%d", canvas_size.x, canvas_size.y);
-  	DEBUG(DBG_GS, "Starting Ghostscript", buf);
-  	if (app.debug & DBG_GS)
-! 	  execl(app.ghostscript_name, "gs", buf, "-r72", "-sDEVICE=x11", "-dNOPAUSE", NIL);
-  	else
-! 	  execl(app.ghostscript_name, "gs", buf, "-r72", "-sDEVICE=x11", "-dNOPAUSE" "-q", NIL);
-  	cerr << "could not start ghostscript\n";
-  	exit(1);
-        }
-***************
-*** 228,234 ****
-        // setup stream to ghostscript
-        close(to_ghs[0]);
-  
-!       to_gs.close();
-        // catch broken pipes from now on
-        signal(SIGPIPE, sig_pipe_broken);
-        to_gs.openfd(to_ghs[1], "w");
---- 228,235 ----
-        // setup stream to ghostscript
-        close(to_ghs[0]);
-  
-!       if (to_gs.isopen())
-! 	to_gs.close();
-        // catch broken pipes from now on
-        signal(SIGPIPE, sig_pipe_broken);
-        to_gs.openfd(to_ghs[1], "w");
-diff -cr ../Ipe-5.0/Ipe/resources.C Ipe/resources.C
-*** ../Ipe-5.0/Ipe/resources.C	Tue May  9 04:36:09 1995
---- Ipe/resources.C	Wed Oct 25 14:21:26 2000
-***************
-*** 83,89 ****
-  
-  #define RESOURCE_COLOR(name, entry) { \
-    name, XtCColor, XmRString, sizeof(XColor), XtOffsetOf(AppData, entry),\
-!   XmRString, "black" }				      
-  
-  #define RESOURCE_BOOLEAN(name, cls, entry, value) { \
-    name, cls, XmRBoolean, sizeof(Boolean), XtOffsetOf(AppData, entry),\
---- 83,89 ----
-  
-  #define RESOURCE_COLOR(name, entry) { \
-    name, XtCColor, XmRString, sizeof(XColor), XtOffsetOf(AppData, entry),\
-!   XmRString, XtPointer("black") }				      
-  
-  #define RESOURCE_BOOLEAN(name, cls, entry, value) { \
-    name, cls, XmRBoolean, sizeof(Boolean), XtOffsetOf(AppData, entry),\
-***************
-*** 91,101 ****
-  
-  #define RESOURCE_STRING(name, entry, value) { \
-    name, XmCString, XmRString, sizeof(char *), XtOffsetOf(AppData, entry),\
-!   XmRImmediate, value }
-  
-  #define RESOURCE_FLOAT(name, cls, entry, value) { \
-    name, cls, XtRFloat, sizeof(float), XtOffsetOf(AppData, entry),\
-!   XmRString, value }
-  
-  #define RESOURCE_INT(name, cls, entry, value) { \
-    name, cls, XmRInt, sizeof(int), XtOffsetOf(AppData, entry),\
---- 91,101 ----
-  
-  #define RESOURCE_STRING(name, entry, value) { \
-    name, XmCString, XmRString, sizeof(char *), XtOffsetOf(AppData, entry),\
-!   XmRImmediate, XtPointer(value) }
-  
-  #define RESOURCE_FLOAT(name, cls, entry, value) { \
-    name, cls, XtRFloat, sizeof(float), XtOffsetOf(AppData, entry),\
-!   XmRString, XtPointer(value) }
-  
-  #define RESOURCE_INT(name, cls, entry, value) { \
-    name, cls, XmRInt, sizeof(int), XtOffsetOf(AppData, entry),\
diff --git a/graphics/ipe/files/patch-Ipe.app-defaults b/graphics/ipe/files/patch-Ipe.app-defaults
deleted file mode 100644
index 62c98db704f5..000000000000
--- a/graphics/ipe/files/patch-Ipe.app-defaults
+++ /dev/null
@@ -1,91 +0,0 @@
-*** ../Ipe-5.0/Ipe.app-defaults	Tue May  9 04:38:01 1995
---- Ipe.app-defaults	Sun Nov  5 15:31:31 2000
-***************
-*** 6,13 ****
-  !
-  ! Main Geometry
-  !
-! *mainWindow.width:		17500
-! *mainWindow.height:  		17500
-  
-  *mainForm.horizontalSpacing:	120
-  *mainForm.verticalSpacing:	120
---- 6,13 ----
-  !
-  ! Main Geometry
-  !
-! *mainWindow.width:		27500
-! *mainWindow.height:  		22500
-  
-  *mainForm.horizontalSpacing:	120
-  *mainForm.verticalSpacing:	120
-***************
-*** 341,347 ****
-  !
-  ! INSTALL: Name and path of ghostscript interpreter
-  !
-! *ghostscriptName:	/net/bin/gs
-  !
-  ! INSTALL: Command to call Dvips on DVI file
-  !
---- 341,347 ----
-  !
-  ! INSTALL: Name and path of ghostscript interpreter
-  !
-! *ghostscriptName:	/usr/local/bin/gs
-  !
-  ! INSTALL: Command to call Dvips on DVI file
-  !
-***************
-*** 358,372 ****
-  ! INSTALL: Command to start help system
-  !
-  *helpCommand:		\
-! 	Mosaic http://www.cs.ruu.nl/people/otfried/html/Ipe/Ipe.html &
-  !
-  ! INSTALL: Directories where Ipe can find Ipe User Macros (IUMs)
-  !
-! *iumDirectories:	/packages/ipe/lib/ium:/packages/ipe/lib/contrib
-  !
-  ! INSTALL: Command to print a Postscript file
-  !
-! *printCommand:		laser -Plaspr2 %s &
-  !
-  ! Names of Screen fonts that will be used to represent text objects
-  !
---- 358,373 ----
-  ! INSTALL: Command to start help system
-  !
-  *helpCommand:		\
-! 	netscape file://localhost/usr/local/lib/ipe/doc/Ipe.html &
-! 
-  !
-  ! INSTALL: Directories where Ipe can find Ipe User Macros (IUMs)
-  !
-! *iumDirectories: /usr/local/lib/ipe/lib/ium:
-  !
-  ! INSTALL: Command to print a Postscript file
-  !
-! *printCommand:		lpr  %s 
-  !
-  ! Names of Screen fonts that will be used to represent text objects
-  !
-***************
-*** 445,452 ****
-  
-  ! Commands to call previewer on Postscript file
-  !
-! *mipePreviewCommand:	gv -a4 -magstep -2 %s &
-! *ipePreviewCommand:	gv -a4 -magstep -1 %s &
-  !
-  ! LaTeX preamble
-  !
---- 446,453 ----
-  
-  ! Commands to call previewer on Postscript file
-  !
-! *mipePreviewCommand:	gv  -magstep -2 %s &
-! *ipePreviewCommand:	gv  -magstep -1 %s &
-  !
-  ! LaTeX preamble
-  !
diff --git a/graphics/ipe/files/patch-Ium b/graphics/ipe/files/patch-Ium
deleted file mode 100644
index 8940cc656a78..000000000000
--- a/graphics/ipe/files/patch-Ium
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -cr ../Ipe-5.0/Ium/Makefile Ium/Makefile
-*** ../Ipe-5.0/Ium/Makefile	Thu Nov 27 16:49:47 1997
---- Ium/Makefile	Thu Oct 26 14:09:39 2000
-***************
-*** 10,17 ****
-  INCLUDE_DIRS	= -I../Plageo 
-  LIB_DIRS	= -L../Plageo
-  
-! CFLAGS		= -O $(INCLUDE_DIRS)
-! LFLAGS		= -s $(LIB_DIRS)
-  
-  CC		= g++ 
-  CPLUS		= g++ 
---- 10,17 ----
-  INCLUDE_DIRS	= -I../Plageo 
-  LIB_DIRS	= -L../Plageo
-  
-! CFLAGS		= -O $(INCLUDE_DIRS) -DHAVE_BOOL -fno-for-scope
-! LFLAGS		= $(LIB_DIRS)
-  
-  CC		= g++ 
-  CPLUS		= g++ 
-diff -cr ../Ipe-5.0/Ium/ium.h Ium/ium.h
-*** ../Ipe-5.0/Ium/ium.h	Tue May  9 04:36:13 1995
---- Ium/ium.h	Wed Oct 25 15:28:19 2000
-***************
-*** 61,67 ****
---- 61,69 ----
-  #define IPE_BOLD    2
-  #define IPE_MATH    3
-  
-+ #ifndef HAVE_BOOL
-  typedef int bool;
-+ #endif
-  #ifdef IUM_PLAGEO
-  typedef pl_vec vertex;
-  #else
diff --git a/graphics/ipe/files/patch-Ium_gridalign.c b/graphics/ipe/files/patch-Ium_gridalign.c
deleted file mode 100644
index 933012f1454e..000000000000
--- a/graphics/ipe/files/patch-Ium_gridalign.c
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Ium/gridalign.c.orig	Fri Nov 29 16:04:46 2002
-+++ Ium/gridalign.c	Fri Nov 29 16:04:53 2002
-@@ -113,7 +113,7 @@
-   ium_output = ium_input;
- }
- 
--void main(int argc, char **argv)
-+int main(int argc, char **argv)
- {
-   ium_begin(argc, argv);
-   
diff --git a/graphics/ipe/files/patch-Makefile b/graphics/ipe/files/patch-Makefile
deleted file mode 100644
index a8869a8d4f5b..000000000000
--- a/graphics/ipe/files/patch-Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-*** ../Ipe-5.0/Makefile	Sat Dec 20 12:05:11 1997
---- Makefile	Sun Nov  5 14:55:20 2000
-***************
-*** 1,33 ****
-  ###########################################################################
-  # Ipe Makefile for Linux
-! #       
-  # Make and installation kit for linux
-  ###########################################################################
-  .PHONY : install build
-  
-! INSTALL_DIR=/usr/local/lib/ipe
-  
-! build: 
-  	cd Plageo/ ; make
-  	cd Ipe/ ; make
-  	cd Ium/ ; make
-  
-! install: build
-! 	mkdir -p $(INSTALL_DIR) $(INSTALL_DIR)/bin $(INSTALL_DIR)/lib 
-  	mkdir -p $(INSTALL_DIR)/lib/ium 
-  	mkdir -p $(INSTALL_DIR)/doc 
-! 	cp Ipe/ipe $(INSTALL_DIR)/bin/
-! 	rm -f /usr/local/bin/ipe
-! 	ln -s $(INSTALL_DIR)/bin/ipe /usr/local/bin/ipe
-! 	cp Ium/*.ium $(INSTALL_DIR)/lib/ium/
-! 	cp html/* $(INSTALL_DIR)/doc/
-! 	cp Ipe.app-defaults.linux /usr/lib/X11/app-defaults/Ipe
-! 	cp ipe2eps /usr/local/bin/
-! 
-! kitit: 
-! 	cd Plageo/ ; rm -r -f *.o
-! 	cd Ipe/ ; rm -r -f *.o
-! 	cd Ium/ ; rm -r -f *.o
-! 	rm -f Ipe-5.0.tar Ipe-5.0.tar.gz
-! 	cd .. ; tar cf Ipe-5.0/Ipe-5.0.tar Ipe-5.0/*
-! 	gzip Ipe-5.0.tar
---- 1,33 ----
-  ###########################################################################
-  # Ipe Makefile for Linux
-! # Modfied for FreeBSD ports, David Bremner     
-  # Make and installation kit for linux
-  ###########################################################################
-  .PHONY : install build
-  
-! INSTALL_DIR= ${PREFIX}/lib/ipe
-! IPETEXDIR= ${LOCALBASE}/share/texmf/tex/latex/ipe
-  
-! all: 
-  	cd Plageo/ ; make
-  	cd Ipe/ ; make
-  	cd Ium/ ; make
-  
-! install: all
-! 	mkdir -p $(INSTALL_DIR) $(INSTALL_DIR)/lib 
-  	mkdir -p $(INSTALL_DIR)/lib/ium 
-  	mkdir -p $(INSTALL_DIR)/doc 
-! 	mkdir -p ${IPETEXDIR}
-! 	$(BSD_INSTALL_PROGRAM) Ipe/ipe $(PREFIX)/bin
-! 	$(BSD_INSTALL_PROGRAM) Ium/goodies.ium $(INSTALL_DIR)/lib/ium/
-! 	$(BSD_INSTALL_PROGRAM) Ium/gridalign.ium $(INSTALL_DIR)/lib/ium/
-! 	$(BSD_INSTALL_SCRIPT) Ium/postscript.ium $(INSTALL_DIR)/lib/ium/
-! 	$(BSD_INSTALL_PROGRAM) Ium/spline.ium $(INSTALL_DIR)/lib/ium/
-! 	$(BSD_INSTALL_DATA) html/* $(INSTALL_DIR)/doc/
-! 	$(BSD_INSTALL_DATA) Ipe.app-defaults ${X11BASE}/lib/X11/app-defaults/Ipe
-! 	$(BSD_INSTALL_DATA) ipe2eps $(PREFIX)/bin
-! 	$(BSD_INSTALL_DATA) tex/ipe.sty ${IPETEXDIR}
-! 	$(BSD_INSTALL_DATA) tex/mipe.sty ${IPETEXDIR}
-! 	$(BSD_INSTALL_DATA) tex/ipe_pages.tex ${IPETEXDIR}
-! 	$(BSD_INSTALL_DATA) tex/mipe.cls ${IPETEXDIR}
-! 	${PREFIX}/bin/texconfig rehash
diff --git a/graphics/ipe/files/patch-Plageo b/graphics/ipe/files/patch-Plageo
deleted file mode 100644
index c05c8172f8ac..000000000000
--- a/graphics/ipe/files/patch-Plageo
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -cr ../Ipe-5.0/Plageo/Makefile Plageo/Makefile
-*** ../Ipe-5.0/Plageo/Makefile	Thu Nov 27 15:15:48 1997
---- Plageo/Makefile	Thu Oct 26 14:41:49 2000
-***************
-*** 12,18 ****
-  CC	= g++
-  # define GFLAGS if you use g++
-  #GFLAGS  =
-! GFLAGS	= -fno-for-scope
-  
-  INCLUDE = -I.
-  CFLAGS  = $(GFLAGS) -O $(INCLUDE)
---- 12,18 ----
-  CC	= g++
-  # define GFLAGS if you use g++
-  #GFLAGS  =
-! GFLAGS	= -fno-for-scope -g
-  
-  INCLUDE = -I.
-  CFLAGS  = $(GFLAGS) -O $(INCLUDE)
-diff -cr ../Ipe-5.0/Plageo/ipestream.h Plageo/ipestream.h
-*** ../Ipe-5.0/Plageo/ipestream.h	Mon Dec 18 11:19:43 1995
---- Plageo/ipestream.h	Thu Oct 26 15:16:31 2000
-***************
-*** 21,28 ****
-  public:
-    ipestream(void)	{ _f = NULL; }
-    ipestream(FILE *fd)	{ _f = fd; }
-!   
-!   int open(char *fname, char *mode) {
-      _f = fopen(fname, mode); return (_f != NULL); }
-    int openfd(int fd, char *mode) {
-      _f = fdopen(fd, mode); return (_f != NULL); }
---- 21,28 ----
-  public:
-    ipestream(void)	{ _f = NULL; }
-    ipestream(FILE *fd)	{ _f = fd; }
-!   int isopen(void) { return (_f != NULL); };
-!   int open(const char *fname, char *mode) {
-      _f = fopen(fname, mode); return (_f != NULL); }
-    int openfd(int fd, char *mode) {
-      _f = fdopen(fd, mode); return (_f != NULL); }
-diff -cr ../Ipe-5.0/Plageo/ireray.C Plageo/ireray.C
-*** ../Ipe-5.0/Plageo/ireray.C	Tue May  9 04:35:50 1995
---- Plageo/ireray.C	Wed Oct 25 11:31:18 2000
-***************
-*** 40,46 ****
-  // template<class T>
-  reray_T::reray_T(const reray_T & a)
-  {
-!     register i = a.sz;
-      reserved_size = sz = i;
-      if (i==0) {
-  	v = 0;
---- 40,46 ----
-  // template<class T>
-  reray_T::reray_T(const reray_T & a)
-  {
-!     register unsigned int i = a.sz;
-      reserved_size = sz = i;
-      if (i==0) {
-  	v = 0;
-Only in ../Ipe-5.0/Plageo: libplageo.a
-diff -cr ../Ipe-5.0/Plageo/pl_coincidence.C Plageo/pl_coincidence.C
-*** ../Ipe-5.0/Plageo/pl_coincidence.C	Tue May  9 04:35:52 1995
---- Plageo/pl_coincidence.C	Wed Oct 25 11:28:53 2000
-***************
-*** 468,475 ****
-  
-  typedef edgelist_link *edgelistp;
-  
-! static const    up = 0;
-! static const    down = 1;
-  
-  // sorted list of edges intersecting current sweep line
-  static edgelistp el = 0;
---- 468,475 ----
-  
-  typedef edgelist_link *edgelistp;
-  
-! static const int    up = 0;
-! static const int   down = 1;
-  
-  // sorted list of edges intersecting current sweep line
-  static edgelistp el = 0;
-diff -cr ../Ipe-5.0/Plageo/plageo.h Plageo/plageo.h
-*** ../Ipe-5.0/Plageo/plageo.h	Tue May  9 04:35:50 1995
---- Plageo/plageo.h	Wed Oct 25 11:28:06 2000
-***************
-*** 1050,1065 ****
-  
-  extern int lies_inside(const pl_fixedvec &, const pl_disc &);
-  
-! inline do_overlap(const pl_fixedvec &vec, const pl_box &box)
-  { return lies_inside(vec, box); }
-  
-! inline do_overlap(const pl_fixedvec &vec, const pl_pgn &pgn)
-  { return lies_inside(vec, pgn); }
-  
-! inline do_overlap(const pl_fixedvec &vec, const pl_disc &disc)
-  { return lies_inside(vec, disc); }
-  
-! inline do_overlap(const pl_fixedvec &vec, const pl_object &obj)
-  { return do_overlap(obj, vec); }
-  
-  // ******   POINT   ******
---- 1050,1065 ----
-  
-  extern int lies_inside(const pl_fixedvec &, const pl_disc &);
-  
-! inline int do_overlap(const pl_fixedvec &vec, const pl_box &box)
-  { return lies_inside(vec, box); }
-  
-! inline int do_overlap(const pl_fixedvec &vec, const pl_pgn &pgn)
-  { return lies_inside(vec, pgn); }
-  
-! inline int  do_overlap(const pl_fixedvec &vec, const pl_disc &disc)
-  { return lies_inside(vec, disc); }
-  
-! inline int do_overlap(const pl_fixedvec &vec, const pl_object &obj)
-  { return do_overlap(obj, vec); }
-  
-  // ******   POINT   ******
diff --git a/graphics/ipe/files/patch-config-pro b/graphics/ipe/files/patch-config-pro
new file mode 100644
index 000000000000..1884d9c94cb9
--- /dev/null
+++ b/graphics/ipe/files/patch-config-pro
@@ -0,0 +1,82 @@
+*** config.pro.orig	Mon Nov 17 15:43:31 2003
+--- config.pro	Sat Jan 10 10:16:54 2004
+***************
+*** 8,16 ****
+  # Freetype location
+  #
+  # Path to "ft2build.h" (if not on standard include path)
+! INCLUDEPATH += /usr/include/freetype2
+  # Path to "libfreetype.so" (if not in a standard library directory)
+! #LIBS       += /usr/lib
+  # --------------------------------------------------------------------
+  #
+  # Zlib location
+--- 8,16 ----
+  # Freetype location
+  #
+  # Path to "ft2build.h" (if not on standard include path)
+! INCLUDEPATH += $${LOCALBASE}/include/freetype2
+  # Path to "libfreetype.so" (if not in a standard library directory)
+! LIBS       += -L$${LOCALBASE}/lib	   
+  # --------------------------------------------------------------------
+  #
+  # Zlib location
+***************
+*** 43,49 ****
+  #
+  #IPEPREFIX  = /usr/local/ipe
+  #IPEPREFIX  = /usr
+! IPEPREFIX  = /opt/ipe-6.0
+  #
+  # Where Ipe executables will be installed ('ipe', 'ipe5toxml' etc)
+  IPEBINDIR  = $${IPEPREFIX}/bin
+--- 43,49 ----
+  #
+  #IPEPREFIX  = /usr/local/ipe
+  #IPEPREFIX  = /usr
+! IPEPREFIX  = $${PREFIX}
+  #
+  # Where Ipe executables will be installed ('ipe', 'ipe5toxml' etc)
+  IPEBINDIR  = $${IPEPREFIX}/bin
+***************
+*** 55,61 ****
+  IPEHEADERDIR = $${IPEPREFIX}/include
+  #
+  # Where Ipelets will be installed:
+! IPELETDIR = $${IPEPREFIX}/lib/ipe/$${IPEVERS}/ipelets
+  #
+  # List of paths where Ipe will search for Ipelets:
+  # (Paths are separated by ":" on Windows and ";" on Unix)
+--- 55,61 ----
+  IPEHEADERDIR = $${IPEPREFIX}/include
+  #
+  # Where Ipelets will be installed:
+! IPELETDIR = $${IPEPREFIX}/libexec/ipe/$${IPEVERS}/ipelets
+  #
+  # List of paths where Ipe will search for Ipelets:
+  # (Paths are separated by ":" on Windows and ";" on Unix)
+***************
+*** 74,81 ****
+  #
+  # The HTML browser started to read the on-line Ipe documentation.
+  #IPEBROWSER = netscape
+! IPEBROWSER = konqueror
+  # --------------------------------------------------------------------
+  # Standard definitions --- don't change
+  CONFIG      += warn_on release
+  linux-g++:QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-sign-compare
+--- 74,87 ----
+  #
+  # The HTML browser started to read the on-line Ipe documentation.
+  #IPEBROWSER = netscape
+! IPEBROWSER = $${WWWBROWSER}
+  # --------------------------------------------------------------------
++ # Respect CXX and CC variables
++ QMAKE_CXX=$${CXX}
++ QMAKE_CC=$${CC}
++ QMAKE_LINK		= $${LINK}
++ QMAKE_LINK_SHLIB	= $${LINK_SHLIB}
++ 
+  # Standard definitions --- don't change
+  CONFIG      += warn_on release
+  linux-g++:QMAKE_CXXFLAGS_WARN_ON += -Wno-unused -Wno-sign-compare
diff --git a/graphics/ipe/files/patch-ipe-ipe-pro b/graphics/ipe/files/patch-ipe-ipe-pro
new file mode 100644
index 000000000000..0a0e9a976402
--- /dev/null
+++ b/graphics/ipe/files/patch-ipe-ipe-pro
@@ -0,0 +1,19 @@
+*** ipe/ipe.pro~	Mon Nov 17 15:43:31 2003
+--- ipe/ipe.pro	Tue Jan  6 13:52:23 2004
+***************
+*** 72,78 ****
+  win32:LIBS      += d:/devel/freetype/lib/freetype.lib
+  win32:INCLUDEPATH += d:/devel/zlib/src
+  win32:LIBS	+= d:/devel/zlib/lib/zlib.lib
+! unix:LIBS       += -L../../build/lib -lxpdf -lipe -lfreetype -lz -ldl
+  win32:TARGETDEPS += ../../build/lib/ipe.lib
+  # --------------------------------------------------------------------
+  unix:DEFINES += IPEBINDIR=\"$$IPEBINDIR\"
+--- 72,78 ----
+  win32:LIBS      += d:/devel/freetype/lib/freetype.lib
+  win32:INCLUDEPATH += d:/devel/zlib/src
+  win32:LIBS	+= d:/devel/zlib/lib/zlib.lib
+! unix:LIBS       += -L../../build/lib -lxpdf -lipe -lfreetype -lz 
+  win32:TARGETDEPS += ../../build/lib/ipe.lib
+  # --------------------------------------------------------------------
+  unix:DEFINES += IPEBINDIR=\"$$IPEBINDIR\"
diff --git a/graphics/ipe/files/patch-tex b/graphics/ipe/files/patch-tex
deleted file mode 100644
index 82c7574635c4..000000000000
--- a/graphics/ipe/files/patch-tex
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -cr ../Ipe-5.0/tex/ipe_pages.tex tex/ipe_pages.tex
-*** ../Ipe-5.0/tex/ipe_pages.tex	Tue May  9 04:38:01 1995
---- tex/ipe_pages.tex	Fri Oct 27 16:04:44 2000
-***************
-*** 41,50 ****
-  % To achieve this, we make a picture environment with this origin, and then
-  % ignore the picture environment in the Ipe file
-  %
-  \makeatletter\@ifundefined{IpeScale}{}{\IpeScale{100}}\makeatother
-  \unitlength=1bp
-  \setbox0=\hbox{\special{papersize=1000bp,1000bp}%
-!   \makebox(0,0)[lt]{\begin{picture}(928,928)(-428,-500)
-      \bgroup
-      \def\picture(#1)(#2){}\let\endpicture\relax
-      \Ipe{page1.ipe}
---- 41,51 ----
-  % To achieve this, we make a picture environment with this origin, and then
-  % ignore the picture environment in the Ipe file
-  %
-+ % WARNING, modifed cluelessly by David Bremner, bremner@unb.ca
-  \makeatletter\@ifundefined{IpeScale}{}{\IpeScale{100}}\makeatother
-  \unitlength=1bp
-  \setbox0=\hbox{\special{papersize=1000bp,1000bp}%
-!   \makebox(0,0)[lt]{\begin{picture}(928,928)(15,120)
-      \bgroup
-      \def\picture(#1)(#2){}\let\endpicture\relax
-      \Ipe{page1.ipe}
-diff -cr ../Ipe-5.0/tex/mipe.cls tex/mipe.cls
-*** ../Ipe-5.0/tex/mipe.cls	Tue May  9 04:38:02 1995
---- tex/mipe.cls	Fri Oct 27 16:50:21 2000
-***************
-*** 81,93 ****
-  \def\Ipage#1{\vbox to \paperheight{\vfill
-      \hbox to \paperwidth{\hfill\Ipe{page#1.ipe}\hfill}\vfill}\newpage}
-  
-! \ExecuteOptions{a4paper}
-  \ProcessOptions
-  
-  % need ipe package
-  
-  \RequirePackage{ipe}
-- 
-  % use full paper for printing
-  
-  \textwidth\paperwidth
---- 81,92 ----
-  \def\Ipage#1{\vbox to \paperheight{\vfill
-      \hbox to \paperwidth{\hfill\Ipe{page#1.ipe}\hfill}\vfill}\newpage}
-  
-! \ExecuteOptions{letterpaper}
-  \ProcessOptions
-  
-  % need ipe package
-  
-  \RequirePackage{ipe}
-  % use full paper for printing
-  
-  \textwidth\paperwidth
-***************
-*** 296,304 ****
-  \DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-  \DeclareOldFontCommand{\sl}{\normalfont\slshape}{\relax}
-  \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\relax}
-! \renewcommand{\cal}{\protect\pcal}
-  \newcommand{\pcal}{\@fontswitch{\relax}{\mathcal}}
-! \renewcommand{\mit}{\protect\pmit}
-  \newcommand{\pmit}{\@fontswitch{\relax}{\mathnormal}}
-  \renewcommand\footnoterule{}
-  \def\thefootnote{\fnsymbol{footnote}}
---- 295,303 ----
-  \DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
-  \DeclareOldFontCommand{\sl}{\normalfont\slshape}{\relax}
-  \DeclareOldFontCommand{\sc}{\normalfont\scshape}{\relax}
-! %\renewcommand{\cal}{\protect\pcal}
-  \newcommand{\pcal}{\@fontswitch{\relax}{\mathcal}}
-! %\renewcommand{\mit}{\protect\pmit}
-  \newcommand{\pmit}{\@fontswitch{\relax}{\mathnormal}}
-  \renewcommand\footnoterule{}
-  \def\thefootnote{\fnsymbol{footnote}}
-Only in tex: mipe.log