Upgrade to version 1.4.

PR:		33338
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

Other files (pkg-plist, Makefile, etc) were committed few minutes ago,
but the corresponding e-mail was not sent (apparently) because I aborted
cvs ci in files/ directory.  I don't know whether it is a bug or a feature...

7 files changed, 41 insertions, 137 deletions

diff --git a/x11/gdkxft/files/patch-configure b/x11/gdkxft/files/patch-configure
deleted file mode 100644
index e4f846d..0000000
--- a/x11/gdkxft/files/patch-configure
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- configure.orig	Sat Sep  1 23:42:19 2001
-+++ configure	Mon Sep  3 18:08:35 2001
-@@ -1744,9 +1744,9 @@
- 
- echo $ac_n "checking for libgdk.la""... $ac_c" 1>&6
- echo "configure:1747: checking for libgdk.la" >&5
--GTK_PREFIX=`gtk-config --prefix`
-+GTK_PREFIX=`$GTK_CONFIG --prefix`
- GDK_LIB_PREFIX=$GTK_PREFIX/lib
--GDK_LA=$GDK_LIB_PREFIX/libgdk.la
-+GDK_LA=$GDK_LIB_PREFIX/libgdk12.a
- if test -r $GDK_LA
- then echo "$ac_t""$GDK_LA" 1>&6
- else echo "$ac_t""not found" 1>&6 ; { echo "configure: error: libgdk.la is missing" 1>&2; exit 1; }
-@@ -1754,7 +1754,7 @@
- 
- echo $ac_n "checking for dlopenable libgdk.so""... $ac_c" 1>&6
- echo "configure:1757: checking for dlopenable libgdk.so" >&5
--GDK_DLOPEN_NAME=`sed -n -e "s/^dlname='\\([^']*\\)'$/\\1/p" $GDK_LA`
-+GDK_DLOPEN_NAME="libgdk12.so"
- if test x$GDK_DLOPEN_NAME = x
- then echo "$ac_t""not found" 1>&6 ; { echo "configure: error: can't see how to dlopen libgdk" 1>&2; exit 1; }
- else echo "$ac_t""$GDK_DLOPEN_NAME" 1>&6
diff --git a/x11/gdkxft/files/patch-ltmain.sh b/x11/gdkxft/files/patch-ltmain.sh
new file mode 100644
index 0000000..d74b3db
--- /dev/null
+++ b/x11/gdkxft/files/patch-ltmain.sh
@@ -0,0 +1,33 @@
+--- ltmain.sh.orig	Fri Oct 26 23:15:52 2001
++++ ltmain.sh	Sat Dec 29 12:52:15 2001
+@@ -944,6 +944,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -2408,6 +2409,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4179,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11/gdkxft/files/patch-src::Makefile.in b/x11/gdkxft/files/patch-src::Makefile.in
deleted file mode 100644
index e2c2cbd..0000000
--- a/x11/gdkxft/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Sat Sep  1 23:42:27 2001
-+++ src/Makefile.in	Mon Sep  3 18:37:07 2001
-@@ -22,7 +22,7 @@
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
--datadir = @datadir@
-+datadir = @datadir@/gdkxft
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
-@@ -96,7 +96,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--libgdkxft_la_LDFLAGS = 
-+libgdkxft_la_LDFLAGS = -avoid-version
- libgdkxft_la_LIBADD = 
- libgdkxft_la_OBJECTS =  gdkxft.lo realfuncs.lo
- SCRIPTS =  $(bin_SCRIPTS)
diff --git a/x11/gdkxft/files/patch-src::gdkxft.c b/x11/gdkxft/files/patch-src::gdkxft.c
deleted file mode 100644
index 6970756..0000000
--- a/x11/gdkxft/files/patch-src::gdkxft.c
+++ /dev/null
@@ -1,23 +0,0 @@
-
-$FreeBSD$
-
---- src/gdkxft.c.orig	Sat Sep  1 19:00:02 2001
-+++ src/gdkxft.c	Mon Sep  3 18:34:29 2001
-@@ -20,7 +20,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <regex.h>
-+#include <gnuregex.h>
- 
- #include <X11/Xlib.h>
- #include <X11/Xos.h>
-@@ -170,7 +170,7 @@
-   else if(!access(SYSCONFDIR "/gdkxft.conf",R_OK)) 
-     read_cfg_file(SYSCONFDIR "/gdkxft.conf",xfre,ftre);
-   else 
--    read_cfg_file(DATADIR "/gdkxft.conf",xfre,ftre);
-+    read_cfg_file(DATADIR "/gdkxft/gdkxft.conf",xfre,ftre);
- 
-   /* compile regexps */
-   g_string_append_c(xfre,'$');
diff --git a/x11/gdkxft/files/patch-src::gdkxft.conf b/x11/gdkxft/files/patch-src::gdkxft.conf
index fb589ac..23953ff 100644
--- a/x11/gdkxft/files/patch-src::gdkxft.conf
+++ b/x11/gdkxft/files/patch-src::gdkxft.conf
@@ -1,12 +1,12 @@
-
-$FreeBSD$
-
---- src/gdkxft.conf	2001/09/03 16:40:47	1.1
-+++ src/gdkxft.conf	2001/09/03 16:41:01
-@@ -1,5 +1,3 @@
+--- src/gdkxft.conf.orig	Fri Nov 30 22:51:52 2001
++++ src/gdkxft.conf	Sat Dec 29 15:44:29 2001
+@@ -1,8 +1,2 @@
  !*
 --urw-*
---b&h-*
+--b&h-lucidux*
 --abisource-*
+--abiword-*
+--freefont-*
+--sharefont-*
+--macromedia-*
 +-*-*
- 
diff --git a/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in b/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in
deleted file mode 100644
index f5df295..0000000
--- a/x11/gdkxft/files/patch-src::gdkxft_sysinstall.in
+++ /dev/null
@@ -1,43 +0,0 @@
-
-$FreeBSD$
-
---- src/gdkxft_sysinstall.in.orig	Tue Sep  4 15:29:48 2001
-+++ src/gdkxft_sysinstall.in	Wed Sep  5 11:16:07 2001
-@@ -274,7 +274,7 @@
- 	$xfttop=<XFT>;
- 	close(XFT);
-     };
--    if(!($xfttop =~ /\$XFree86\$/)) {
-+    if(!($xfttop =~ /\$XFree86.*\$/)) {
- 	print STDERR "Your $outfile is already configured.\n";
- 	return;
-     }
-@@ -434,7 +434,7 @@
- 
- # create a theme to show off anti-aliased fonts
- sub install_theme {
--    my $themedir=`gtk-config --prefix` || "/usr";
-+    my $themedir=`gtk12-config --prefix` || "/usr";
-     chomp $themedir;
-     $themedir.="/share/themes";
- 
-@@ -443,8 +443,8 @@
- 	return 0;
-     };
- 
--    mkdir "$themedir/Gdkxft";
--    mkdir "$themedir/Gdkxft/gtk";
-+    mkdir "$themedir/Gdkxft", 0755;
-+    mkdir "$themedir/Gdkxft/gtk", 0755;
-     my $file = "$themedir/Gdkxft/gtk/gtkrc";
- 
-     print STDERR "Creating $file\n";
-@@ -500,7 +500,7 @@
-     return 1;
- }
- sub uninstall_theme {
--    my $themedir=`gtk-config --prefix` || "/usr";
-+    my $themedir=`gtk12-config --prefix` || "/usr";
-     chomp $themedir;
-     $themedir.="/share/themes";
- 
diff --git a/x11/gdkxft/files/patch-src::generate.pl b/x11/gdkxft/files/patch-src::generate.pl
deleted file mode 100644
index 6d0b975..0000000
--- a/x11/gdkxft/files/patch-src::generate.pl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/generate.pl	2001/09/03 15:18:41	1.1
-+++ src/generate.pl	2001/09/03 15:19:10
-@@ -273,7 +273,7 @@
- $indent = $ENV{INDENT};
- $indent = "indent" unless $indent;
- 
--readgtkheader "echo '#include <$modheader>'| cpp -P `gtk-config --cflags`|";
-+readgtkheader "echo '#include <$modheader>'| cpp -P `gtk12-config --cflags`|";
- readmysource $source;
- 
- open(OUT, "|$indent >realfuncs.h") ||die;