Update to 20031210.

PR:		ports/61725
Submitted by:	KANOU Hiroki <kanou@khdd.net> (maintainer)

9 files changed, 37 insertions, 141 deletions

diff --git a/print/fontforge/files/patch-Makefile.dynamic.in b/print/fontforge/files/patch-Makefile.dynamic.in
index 1a9bd801c48b..9c8aca62eab7 100644
--- a/print/fontforge/files/patch-Makefile.dynamic.in
+++ b/print/fontforge/files/patch-Makefile.dynamic.in
@@ -1,25 +1,25 @@
---- Makefile.dynamic.in.orig	Tue Dec  3 10:07:14 2002
-+++ Makefile.dynamic.in	Sun Apr 20 16:11:41 2003
+--- 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 @@
  	mkdir -p $(bindir)
  	mkdir -p $(mandir)/man1
  	mkdir -p $(sharedir)
--	$(LIBTOOL) $(INSTALL) -c pfaedit/pfaedit $(bindir)
--	$(LIBTOOL) $(INSTALL) -c pfaedit/sfddiff $(bindir)
--	cp pfaedit/pfaedit-*.ui $(sharedir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/pfaedit $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/sfddiff $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/.libs/acorn2sfd $(bindir)
-+	${BSD_INSTALL_DATA} pfaedit/pfaedit-*.ui $(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)
++	${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
  # if you are editing CID keyed files (and even then you can live without them
 -	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
--	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
--	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
+-	cp $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
+-	cp $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
 +	${BSD_INSTALL_DATA} $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
-+	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
-+	${BSD_INSTALL_MAN} $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/fontforge/fontforge.1 $(mandir)/man1
++	${BSD_INSTALL_MAN} $(srcdir)/fontforge/sfddiff.1 $(mandir)/man1
  
  uninstall:
- 	-rm $(bindir)/pfaedit
+ 	-rm $(bindir)/fontforge
diff --git a/print/fontforge/files/patch-Makefile.static.in b/print/fontforge/files/patch-Makefile.static.in
deleted file mode 100644
index a740eef7b0bf..000000000000
--- a/print/fontforge/files/patch-Makefile.static.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.static.in.orig	Thu Oct 24 03:34:40 2002
-+++ Makefile.static.in	Sat Oct 26 01:55:17 2002
-@@ -39,15 +39,16 @@
- 	mkdir -p $(bindir)
- 	mkdir -p $(mandir)/man1
- 	mkdir -p $(sharedir)
--	cp pfaedit/pfaedit $(bindir)
--	cp pfaedit/sfddiff $(bindir)
--	cp pfaedit/pfaedit-*.ui $(sharedir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/pfaedit $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/sfddiff $(bindir)
-+	${BSD_INSTALL_PROGRAM} pfaedit/acorn2sfd $(bindir)
-+	${BSD_INSTALL_DATA} pfaedit/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
- # if you are editing CID keyed files (and even then you can live without them
--	-cp $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
--	cp $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
--	cp $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
-+	${BSD_INSTALL_DATA}  $(srcdir)/cidmap/*.cidmap $(sharedir) >/dev/null 2>&1
-+	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/pfaedit.1 $(mandir)/man1
-+	${BSD_INSTALL_MAN}  $(srcdir)/pfaedit/sfddiff.1 $(mandir)/man1
- 
- uninstall:
- 	-rm $(bindir)/pfaedit
diff --git a/print/fontforge/files/patch-configure.dynamic.in b/print/fontforge/files/patch-configure.dynamic.in
deleted file mode 100644
index 33e4e850b965..000000000000
--- a/print/fontforge/files/patch-configure.dynamic.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.dynamic.in.orig	Sat Dec  6 02:20:19 2003
-+++ configure.dynamic.in	Wed Jan 21 09:51:24 2004
-@@ -47,7 +47,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -89,8 +88,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.in b/print/fontforge/files/patch-configure.in
deleted file mode 100644
index 55c6597733d2..000000000000
--- a/print/fontforge/files/patch-configure.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig	Thu Dec  4 02:51:54 2003
-+++ configure.in	Tue Jan 20 21:45:56 2004
-@@ -47,7 +47,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc (Darwin uses dyld)
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -89,8 +88,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_ARG_WITH(freetype-bytecode,
diff --git a/print/fontforge/files/patch-configure.static.in b/print/fontforge/files/patch-configure.static.in
deleted file mode 100644
index ffd525fcb656..000000000000
--- a/print/fontforge/files/patch-configure.static.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.static.in.orig	Thu Dec  4 02:51:54 2003
-+++ configure.static.in	Wed Jan 21 09:50:26 2004
-@@ -33,7 +33,6 @@
- 
- AC_SEARCH_LIBS(dlopen, dl) dnl some systems have this in libc
- AC_SEARCH_LIBS(inet_aton, resolv) dnl some systems have this in libc
--AC_SEARCH_LIBS(libiconv, iconv) dnl linux has iconv in libc, mac has libiconv in libiconv, and a define to map iconv() to libiconv(), so we can't do the obvious check
- 
- dnl Is there a better way to add a directory to the include path?
- 
-@@ -75,8 +74,6 @@
- AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, :  ,AC_DEFINE(_NO_LIBJPEG)) 
- AC_CHECK_LIB(tiff, TIFFOpen, : , AC_DEFINE(_NO_LIBTIFF), -lm )
- AC_CHECK_LIB(xml2, xmlParseFile, : , AC_DEFINE(_NO_LIBXML))
--
--AC_CHECK_HEADERS([iconv.h])
- 
- gww_hasbytecode="no"
- AC_CHECK_LIB(freetype, FT_New_Memory_Face, [
diff --git a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
index ab9e6dc4963b..a3e57b01ddb0 100644
--- a/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
+++ b/print/fontforge/files/patch-fontforge::Makefile.dynamic.in
@@ -1,11 +1,20 @@
---- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
-+++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
-@@ -47,7 +47,7 @@
+--- fontforge/Makefile.dynamic.in.orig	Mon Apr 19 07:05:48 2004
++++ fontforge/Makefile.dynamic.in	Mon Apr 19 07:06:42 2004
+@@ -44,7 +44,7 @@
+ 
+ WFLAGS = -Wmissing-prototypes -Wunused -Wimplicit -Wreturn-type -Wparentheses \
+ 	-Wformat -Wchar-subscripts 
+-_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I. $(WFLAGS) $(X_CFLAGS) \
++_CFLAGS = -I$(top_srcdir)/inc -I$(srcdir) -I$(PREFIX)/include -I. $(WFLAGS) $(X_CFLAGS) \
+     @DEFS@ '-DSHAREDIR="$(sharedir)"' -DLIBDIR='"$(libdir)"'
+ CFLAGS = @CFLAGS@ $(_CFLAGS)
+ 
+@@ -52,7 +52,7 @@
      $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la -lm
+ DLIBS = -rpath $(libdir) ../libgunicode.la @LIBS@ -lm
  
--all: pfaedit-en.ui pfaedit sfddiff
-+all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
+-all: pfaedit-en.ui fontforge sfddiff
++all: pfaedit-en.ui fontforge sfddiff acorn2sfd
  
- pfaedit: nomen.h $(pfaedit_OBJECTS)
- 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
+ fontforge: nomen.h $(fontforge_OBJECTS)
+ 	$(LIBTOOL) $(CC) -o fontforge $(fontforge_OBJECTS) $(LIBS)
diff --git a/print/fontforge/files/patch-fontforge::configure-pfaedit.h b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
index 2f2d01191cdf..29c7d0562b25 100644
--- a/print/fontforge/files/patch-fontforge::configure-pfaedit.h
+++ b/print/fontforge/files/patch-fontforge::configure-pfaedit.h
@@ -1,11 +1,11 @@
---- pfaedit/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
-+++ pfaedit/configure-pfaedit.h	Tue May 13 10:24:58 2003
+--- 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 @@
  /*  don't include code for it by default, but if you do want it simply define */
  /*  the following macro							      */
  /*									      */
--/* #define PFAEDIT_CONFIG_TILEPATH					      */
-+#define PFAEDIT_CONFIG_TILEPATH
+-/* #define FONTFORGE_CONFIG_TILEPATH					      */
++#define FONTFORGE_CONFIG_TILEPATH
  /*									      */
  /* 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 */
@@ -13,8 +13,8 @@
  /*  routine. I'm not sure that it's very useful though. It can be used to do  */
  /*  perspective transformations and such				      */
  /*									      */
--/* #define PFAEDIT_CONFIG_NONLINEAR					      */
-+#define PFAEDIT_CONFIG_NONLINEAR
+-/* #define FONTFORGE_CONFIG_NONLINEAR					      */
++#define FONTFORGE_CONFIG_NONLINEAR
  /*									      */
  /* This command takes two strings which specify general expressions in x and y*/
  /*  and applies the specified transformations to the splines.  Note: Each     */
diff --git a/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in b/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
deleted file mode 100644
index ab9e6dc4963b..000000000000
--- a/print/fontforge/files/patch-pfaedit::Makefile.dynamic.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- pfaedit/Makefile.dynamic.in.orig	Thu Mar  6 04:31:05 2003
-+++ pfaedit/Makefile.dynamic.in	Sun Apr 20 16:58:21 2003
-@@ -47,7 +47,7 @@
-     $(X_PRE_LIBS) $(X_11LIB) $(X_EXTRA_LIBS) @LIBS@ $(STATIC_LIBS) -L/usr/lib -lm
- DLIBS = -rpath $(libdir) ../libgunicode.la -lm
- 
--all: pfaedit-en.ui pfaedit sfddiff
-+all: pfaedit-en.ui pfaedit sfddiff acorn2sfd
- 
- pfaedit: nomen.h $(pfaedit_OBJECTS)
- 	$(LIBTOOL) $(CC) -o pfaedit $(pfaedit_OBJECTS) $(LIBS)
diff --git a/print/fontforge/files/patch-pfaedit::configure-pfaededit.h b/print/fontforge/files/patch-pfaedit::configure-pfaededit.h
deleted file mode 100644
index 2f2d01191cdf..000000000000
--- a/print/fontforge/files/patch-pfaedit::configure-pfaededit.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- pfaedit/configure-pfaedit.h.orig	Tue May 13 03:20:08 2003
-+++ pfaedit/configure-pfaedit.h	Tue May 13 10:24:58 2003
-@@ -31,7 +31,7 @@
- /*  don't include code for it by default, but if you do want it simply define */
- /*  the following macro							      */
- /*									      */
--/* #define PFAEDIT_CONFIG_TILEPATH					      */
-+#define PFAEDIT_CONFIG_TILEPATH
- /*									      */
- /* 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 @@
- /*  routine. I'm not sure that it's very useful though. It can be used to do  */
- /*  perspective transformations and such				      */
- /*									      */
--/* #define PFAEDIT_CONFIG_NONLINEAR					      */
-+#define PFAEDIT_CONFIG_NONLINEAR
- /*									      */
- /* This command takes two strings which specify general expressions in x and y*/
- /*  and applies the specified transformations to the splines.  Note: Each     */