4 files changed, 52 insertions, 8 deletions

diff --git a/graphics/gimp1/files/gimp.setfont b/graphics/gimp1/files/gimp.setfont
index 487a91baf0e6..34f91f9b5b26 100644
--- a/graphics/gimp1/files/gimp.setfont
+++ b/graphics/gimp1/files/gimp.setfont
@@ -7,6 +7,7 @@
 $progname = "gimp.setfont";
 $version = "Version 0.4 Feb 07 2000";
 
+$fontset{'chinese'} = "-*-helvetica-medium-r-normal--17-*-*-*-*-*-iso8859-1,-*-kai-medium-r-normal--16-*-*-*-*-*-big5-0";
 $fontset{'czech'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'danish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'dutch'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
@@ -25,6 +26,7 @@ $fontset{'slovak'} = "-*-fixed-medium-r-normal--14-*-*-*-*-*-iso8859-2";
 $fontset{'swedish'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-iso8859-1";
 $fontset{'ukrainian'} = "-*-helvetica-medium-r-normal--14-*-*-*-*-*-koi8-r";
 
+$locale{'chinese'} = "zh_TW.Big5";
 $locale{'czech'} = "cs_CZ.ISO8859-2";
 $locale{'danish'} = "da_DK.ISO_8859-1";
 $locale{'dutch'} = "nl_NL.ISO_8859-1";
@@ -50,6 +52,7 @@ Usage: gimp.setfont <language>
 
 ----------------------------------------------------------------
 [language]          [fontset]
+ chinese             -*-helvetica-(iso8859-1),-*-kai-(big5-0)
  czech               -*-fixed-(iso8859-2)
  danish              -*-helvetica-(iso8859-1)
  dutch               -*-helvetica-(iso8859-1)
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 95af0d629b7f..267a91fa0f0d 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,5 +1,29 @@
---- configure.orig	Fri Feb 11 10:32:12 2000
-+++ configure	Sat Feb 19 13:51:36 2000
+--- configure.orig	Sat Mar  4 10:23:00 2000
++++ configure	Sun Apr  2 21:42:36 2000
+@@ -1494,8 +1494,8 @@
+ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+ DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
++${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
++$libtool_flags --no-verify --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh $lt_target \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+ 
+ # Reload cache, that may have been modified by ltconfig
+@@ -1509,10 +1509,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs --release-ignore /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL="/usr/local/bin/libtool"
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
 @@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
@@ -22,7 +46,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8561,10 +8565,6 @@
+@@ -8563,10 +8567,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp1/files/patch-ak b/graphics/gimp1/files/patch-ak
index 90837d0254f2..ead5311df6ff 100644
--- a/graphics/gimp1/files/patch-ak
+++ b/graphics/gimp1/files/patch-ak
@@ -1,11 +1,17 @@
---- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
-+++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
-@@ -211,7 +211,7 @@
+--- libgimp/Makefile.in.orig	Sat Mar  4 11:10:43 2000
++++ libgimp/Makefile.in	Sun Apr  2 22:40:29 2000
+@@ -209,11 +209,11 @@
+ gimpinclude_HEADERS =  	color_display.h			color_selector.h		gimp.h				gimpchainbutton.h		gimpcolorbutton.h		gimpcolorspace.h	        gimpcompat.h			gimpdialog.h			gimpenums.h			gimpenv.h			gimpexport.h			gimpfeatures.h			gimpfileselection.h		gimphelpui.h			gimplimits.h			gimpmath.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimppatheditor.h		gimppixmap.h			gimpquerybox.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpvector.h			gimpwidgets.h			gimpintl.h			parasite.h			parasiteF.h			parasiteP.h			parasiteio.h
  
- libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+ 
+-libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
- libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
+-libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
++libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libgimpui_la_LIBADD = $(GTK_LIBS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp1/files/patch-ao b/graphics/gimp1/files/patch-ao
new file mode 100644
index 000000000000..e5f1d5a3677c
--- /dev/null
+++ b/graphics/gimp1/files/patch-ao
@@ -0,0 +1,11 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Sun Apr  2 22:41:29 2000
++++ plug-ins/libgck/gck/Makefile.in	Sun Apr  2 22:41:37 2000
+@@ -191,7 +191,7 @@
+ gckinclude_HEADERS =  	gck.h
+ 
+ 
+-libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
++libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
+ 
+ INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)