convert FreeBSD port to NetBSD package

update to gtk---1.0.0

8 files changed, 59 insertions, 174 deletions

diff --git a/x11/gtk--/patches/patch-aa b/x11/gtk--/patches/patch-aa
deleted file mode 100644
index e79f6967f99..00000000000
--- a/x11/gtk--/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/gensig/gensig.cc.orig	Wed May 13 16:25:09 1998
-+++ src/gensig/gensig.cc	Wed May 13 16:26:02 1998
-@@ -680,3 +680,30 @@
-     system(buf);
-     return 0;
- }
-+
-+
-+/* basename function from MOROHOSHI Akihiko <moro@race.u-tokyo.ac.jp> */
-+char *
-+basename(const char * str) {
-+  const char *s,*t;
-+  char *r;
-+  if (str == NULL)
-+    return strdup(".");
-+
-+  if( *str == '\0' )
-+    return strdup(".");
-+      
-+  for (s=str+strlen(str)-1; *s=='/' && s>str; s--) /* trim trailing '/'s */
-+    ;
-+  t=s+1;
-+  for (; s>=str; s--)
-+    if (*s == '/') {
-+      if (t-s>1)
-+        str=s+1;	/* t-s==1 is special case: str=~^/+$ */
-+        break;
-+    }
-+  r=(char *)malloc(t-str+1);
-+  strncpy(r,str,t-str);
-+  r[t-str]='\0';
-+  return r;
-+}
diff --git a/x11/gtk--/patches/patch-ab b/x11/gtk--/patches/patch-ab
deleted file mode 100644
index 67b05290351..00000000000
--- a/x11/gtk--/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/build_sources/Makefile.in.orig	Sun Aug 23 07:09:33 1998
-+++ src/build_sources/Makefile.in	Mon Aug 24 20:03:46 1998
-@@ -324,10 +324,12 @@
- 
- $(gensourcedir)/%.h: $(srcdir)/%.h.m4
- 	rm -f $(gensourcedir)/$(notdir $*).h
--	m4 $(srcdir)/$(notdir $*).h.m4 >$(gensourcedir)/$(notdir $*).h
-+	gm4 $(srcdir)/$(notdir $*).h.m4 >$(gensourcedir)/$(notdir $*).h
- 
- $(gensourcedir)/%.cc $(gensourcedir)/%.h: $(srcdir)/../%.gen_h $(srcdir)/../gensig/gensig.cc
- 	../gensig/gensig $(srcdir)/../$(notdir $*).gen_h $(gensourcedir)/$(notdir $*)
-+	perl -pi -e 's/^#line.*$$//' $(gensourcedir)/$(notdir $*).h
-+	perl -pi -e 's/^#line.*$$//' $(gensourcedir)/$(notdir $*).cc
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/x11/gtk--/patches/patch-ac b/x11/gtk--/patches/patch-ac
deleted file mode 100644
index b22f366b43d..00000000000
--- a/x11/gtk--/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/fontselection.gen_h.orig	Mon Aug 24 20:10:08 1998
-+++ src/fontselection.gen_h	Mon Aug 24 20:10:55 1998
-@@ -169,7 +169,11 @@
-     apply_button(GTK_BUTTON(gtkobj()->apply_button)),
-     cancel_button(GTK_BUTTON(gtkobj()->cancel_button))
- {
--  set_title(title.length() ? title : "Font Selection");
-+  if( title.length() ) {
-+    set_title(title);
-+  } else {
-+    set_title("Font Selection");
-+  }
- }
- 
- Gtk_FontSelectionDialog::Gtk_FontSelectionDialog(GtkFontSelectionDialog *castitem)
diff --git a/x11/gtk--/patches/patch-ad b/x11/gtk--/patches/patch-ad
deleted file mode 100644
index 189603b5002..00000000000
--- a/x11/gtk--/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	Mon Aug 24 20:14:17 1998
-+++ Makefile.in	Mon Aug 24 20:16:23 1998
-@@ -97,8 +97,8 @@
- gnomemm_libdir = @gnomemm_libdir@
- gnomemm_prefix = @gnomemm_prefix@
- 
--SUBDIRS = src examples docgen docs html @GNOME_SUBDIR@
--DIST_SUBDIRS = src examples docgen docs html macros gnome--
-+SUBDIRS = src examples docgen docs html #@GNOME_SUBDIR@
-+DIST_SUBDIRS = src examples docgen docs html macros #gnome--
- 
- bin_SCRIPTS = gtkmm-config
- 
diff --git a/x11/gtk--/patches/patch-ae b/x11/gtk--/patches/patch-ae
deleted file mode 100644
index a61eb7a5289..00000000000
--- a/x11/gtk--/patches/patch-ae
+++ /dev/null
@@ -1,97 +0,0 @@
---- aclocal.m4.orig	Sun Aug 23 07:04:16 1998
-+++ aclocal.m4	Sat Aug 29 14:42:00 1998
-@@ -176,7 +176,7 @@
- dnl
- AC_DEFUN(AM_PATH_GTK,
- [dnl 
--dnl Get the cflags and libraries from the gtk-config script
-+dnl Get the cflags and libraries from the gtk11-config script
- dnl
- AC_ARG_WITH(gtk-prefix,[  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)],
-             gtk_config_prefix="$withval", gtk_config_prefix="")
-@@ -188,17 +188,17 @@
-   if test x$gtk_config_exec_prefix != x ; then
-      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk11-config
-      fi
-   fi
-   if test x$gtk_config_prefix != x ; then
-      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-      if test x${GTK_CONFIG+set} != xset ; then
--        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-+        GTK_CONFIG=$gtk_config_prefix/bin/gtk11-config
-      fi
-   fi
- 
--  AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
-+  AC_PATH_PROG(GTK_CONFIG, gtk11-config, no)
-   min_gtk_version=ifelse([$1], ,0.99.7,$1)
-   AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
-   no_gtk=""
-@@ -220,7 +220,7 @@
-       LIBS="$LIBS $GTK_LIBS"
- dnl
- dnl Now check if the installed GTK is sufficiently new. (Also sanity
--dnl checks the results of gtk-config to some extent
-+dnl checks the results of gtk11-config to some extent
- dnl
-       rm -f conf.gtktest
-       AC_TRY_RUN([
-@@ -247,16 +247,16 @@
-       (gtk_minor_version != $gtk_config_minor_version) ||
-       (gtk_micro_version != $gtk_config_micro_version))
-     {
--      printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-+      printf("\n*** 'gtk11-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-              gtk_major_version, gtk_minor_version, gtk_micro_version);
--      printf ("*** was found! If gtk-config was correct, then it is best\n");
-+      printf ("*** was found! If gtk11-config was correct, then it is best\n");
-       printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-       printf("*** required on your system.\n");
--      printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
--      printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
-+      printf("*** If gtk11-config was wrong, set the environment variable GTK_CONFIG\n");
-+      printf("*** to point to the correct copy of gtk11-config, and remove the file config.cache\n");
-       printf("*** before re-running configure\n");
-     } 
-   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-@@ -285,10 +285,10 @@
-         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-         printf("***\n");
-         printf("*** If you have already installed a sufficiently new version, this error\n");
--        printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
-+        printf("*** probably means that the wrong copy of the gtk11-config shell script is\n");
-         printf("*** being found. The easiest way to fix this is to remove the old version\n");
-         printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
--        printf("*** correct copy of gtk-config. (In this case, you will have to\n");
-+        printf("*** correct copy of gtk11-config. (In this case, you will have to\n");
-         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-         printf("*** so that the correct libraries are found at run-time))\n");
-       }
-@@ -306,10 +306,10 @@
-   else
-      AC_MSG_RESULT(no)
-      if test "$GTK_CONFIG" = "no" ; then
--       echo "*** The gtk-config script installed by GTK could not be found"
-+       echo "*** The gtk11-config script installed by GTK could not be found"
-        echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
-        echo "*** your path, or set the GTK_CONFIG environment variable to the"
--       echo "*** full path to gtk-config."
-+       echo "*** full path to gtk11-config."
-      else
-        if test -f conf.gtktest ; then
-         :
-@@ -338,7 +338,7 @@
-         [ echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK was incorrectly installed"
-           echo "*** or that you have moved GTK since it was installed. In the latter case, you"
--          echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
-+          echo "*** may want to edit the gtk11-config script: $GTK_CONFIG" ])
-           CFLAGS="$ac_save_CFLAGS"
-           LIBS="$ac_save_LIBS"
-        fi
diff --git a/x11/gtk--/patches/patch-af b/x11/gtk--/patches/patch-af
new file mode 100644
index 00000000000..871d241e238
--- /dev/null
+++ b/x11/gtk--/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 1999/03/14 17:12:54 rh Exp $
+
+--- configure.orig	Tue Mar  9 02:53:45 1999
++++ configure	Wed Mar 10 20:44:43 1999
+@@ -1699,6 +1699,7 @@
+   ac_tool_prefix=
+ fi
+ 
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ 
+@@ -1931,6 +1932,7 @@
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
+@@ -4046,10 +4048,12 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
+ 
++if false; then
+   case "$ac_given_INSTALL" in
+   [/$]*) INSTALL="$ac_given_INSTALL" ;;
+   *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+   esac
++fi
+ 
+   echo creating "$ac_file"
+   rm -f "$ac_file"
diff --git a/x11/gtk--/patches/patch-ag b/x11/gtk--/patches/patch-ag
new file mode 100644
index 00000000000..d65d21a2723
--- /dev/null
+++ b/x11/gtk--/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 1999/03/14 17:12:54 rh Exp $
+
+--- gdk--/gdk--/Makefile.in.orig	Tue Mar  9 02:57:22 1999
++++ gdk--/gdk--/Makefile.in	Wed Mar 10 20:53:39 1999
+@@ -123,7 +123,7 @@
+ 
+ libgdkmm_la_SOURCES =  	bitmap.cc    colormap.cc  font.cc      main.cc      window.cc 	color.cc     drawable.cc  gc.cc        pixmap.cc    visual.cc         image.cc
+ 
+-libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION) -release $(GTKMM_RELEASE)
++libgdkmm_la_LDFLAGS = -version-info $(LIBGDKMM_SO_VERSION)
+ 
+ libgdkmmincludedir = $(includedir)/gdk--
+ libgdkmminclude_HEADERS =  	bitmap.h      colormap.h    gc.h          main.h 	color.h       drawable.h    pixmap.h 	font.h        types.h       window.h      visual.h         image.h       list.h
diff --git a/x11/gtk--/patches/patch-ah b/x11/gtk--/patches/patch-ah
new file mode 100644
index 00000000000..6b1f0621956
--- /dev/null
+++ b/x11/gtk--/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1999/03/14 17:12:54 rh Exp $
+
+--- src/gtk--/Makefile.in.orig	Tue Mar  9 02:57:49 1999
++++ src/gtk--/Makefile.in	Wed Mar 10 20:54:33 1999
+@@ -155,7 +155,7 @@
+ 
+ # This builds the library
+ libgtkmm_la_SOURCES = $(gtkmmc)
+-libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -release $(GTKMM_RELEASE) -no-undefined
++libgtkmm_la_LDFLAGS = -version-info $(LIBGTKMM_SO_VERSION) -no-undefined
+ libgtkmm_la_INCLUDES = $(GTK_CFLAGS)
+ libgtkmm_la_LIBADD = $(GTK_LIBS) @LA_FILES@
+ libgtkmm_la_DEPENDENCIES = @LA_FILES@