Upgrade to 20050117.

PR:		ports/76844
Submitted by:	maintainer.

3 files changed, 30 insertions, 9 deletions

diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 9c8aca62eab7..cbccc523d80c 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,15 +1,27 @@
---- Makefile.dynamic.in.orig	Wed Mar  3 04:23:46 2004
-+++ Makefile.dynamic.in	Tue Apr 20 00:17:10 2004
-@@ -53,15 +53,16 @@
+--- Makefile.dynamic.in.orig	Sun Jan  2 00:07:09 2005
++++ Makefile.dynamic.in	Thu Jan 20 17:27:18 2005
+@@ -47,25 +47,26 @@
+ 	$(LIBTOOL) $(INSTALL) -c libgunicode.la $(libdir)/libgunicode.la
+ 	#cp .libs/*.so.*.* $(libdir)
+ 	$(LIBTOOL) --finish $(libdir)
+-	mkdir -p $(libdir)/pkgconfig
+-	$(LIBTOOL) $(INSTALL) -c fontforge.pc $(libdir)/pkgconfig
++	mkdir -p ${PREFIX}/libdata/pkgconfig
++	${BSD_INSTALL_DATA} -c fontforge.pc ${PREFIX}/libdata/pkgconfig
+ 
+ install: $(sharedir) all install_libs
+ # You may need to be root to do the install
  	mkdir -p $(bindir)
  	mkdir -p $(mandir)/man1
  	mkdir -p $(sharedir)
 -	$(LIBTOOL) $(INSTALL) -c fontforge/fontforge $(bindir)
 -	$(LIBTOOL) $(INSTALL) -c fontforge/sfddiff $(bindir)
--	cp fontforge/pfaedit-*.ui $(sharedir)
 +	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/fontforge $(bindir)
 +	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/sfddiff $(bindir)
 +	${BSD_INSTALL_PROGRAM} -c fontforge/.libs/acorn2sfd $(bindir)
+ #	-rm -f $(bindir)/pfaedit
+ #	(cd $(bindir) ; ln -s fontforge pfaedit)
+-	cp fontforge/pfaedit-*.ui $(sharedir)
 +	${BSD_INSTALL_DATA} fontforge/pfaedit-*.ui $(sharedir)
  #The next line will fail for most installs. If you have downloaded the cidmaps
  # this will install them. If you haven't it won't. You only need the cidmaps
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index bde67c94725c..65b567407fab 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -5,7 +5,7 @@
  ACORNOBJS = acorn2sfd.o sfd.o diffstubs.o psunicodenames.o stamp.o
  
 -_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
-+_CFLAGS = -I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype2 -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
++_CFLAGS = -I$(LOCALBASE)/include -I$(top_srcdir)/inc -I$(srcdir) -I. @WFLAGS@ $(X_CFLAGS) \
      @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
  CFLAGS = @CFLAGS@ $(_CFLAGS)
  
diff --git a/print/fontforge/files/patch-fontforge::configure-pfaedit.h b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
index 29c7d0562b25..4b0099afb969 100644
--- a/print/fontforge/files/patch-fontforge::configure-pfaedit.h
+++ b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
@@ -1,6 +1,15 @@
---- fontforge/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
-+++ fontforge/configure-pfaedit.h	Tue May 13 10:24:58 2003
-@@ -31,7 +31,7 @@
+--- fontforge/configure-pfaedit.h.orig	Sat Jan  8 11:11:45 2005
++++ fontforge/configure-pfaedit.h	Thu Jan 20 16:53:29 2005
+@@ -73,7 +73,7 @@
+ /* Sometimes I want to create a glyph which is a word, and this command       */
+ /*  makes that easy                                                           */
+ /*									      */
+-/* #define FONTFORGE_CONFIG_PASTEAFTER					      */
++#define FONTFORGE_CONFIG_PASTEAFTER
+ /*									      */
+ /* The paste after command pastes the contents of the clipboard into the      */
+ /*  current glyph, translates that by the advance width of the current glyph  */
+@@ -84,7 +84,7 @@
  /*  don't include code for it by default, but if you do want it simply define */
  /*  the following macro							      */
  /*									      */
@@ -9,7 +18,7 @@
  /*									      */
  /* The tile path command uses the contents of the clipboard as a tile which is*/
  /*  applied to any selected paths, replacing them. It could be used to make a */
-@@ -42,7 +42,7 @@
+@@ -190,7 +190,7 @@
  /*  routine. I'm not sure that it's very useful though. It can be used to do  */
  /*  perspective transformations and such				      */
  /*									      */