upgrade to 0.99.7

3 files changed, 74 insertions, 316 deletions

diff --git a/graphics/gimp1/files/patch-aa b/graphics/gimp1/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp1/files/patch-aa
+++ b/graphics/gimp1/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp1/files/patch-ac
+++ b/graphics/gimp1/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # 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.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")