Update to version 4.2.7

PR:		ports/69189
Submitted by:	Ports Fury

4 files changed, 11 insertions, 55 deletions

diff --git a/print/gimp-print/files/patch-configure b/print/gimp-print/files/patch-configure
deleted file mode 100644
index c7a648d7016d..000000000000
--- a/print/gimp-print/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Sat Apr 27 09:53:21 2002
-+++ configure	Tue Apr 30 21:46:01 2002
-@@ -6511,6 +6511,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/print/gimp-print/files/patch-src::gimp::Makefile.in b/print/gimp-print/files/patch-src::gimp::Makefile.in
deleted file mode 100644
index fc39001f999f..000000000000
--- a/print/gimp-print/files/patch-src::gimp::Makefile.in
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/gimp/Makefile.in.orig	Tue Jan 13 10:46:08 2004
-+++ src/gimp/Makefile.in	Tue Jan 13 10:46:27 2004
-@@ -259,13 +259,13 @@
- 
- install-gimp_plug_inPROGRAMS: $(gimp_plug_in_PROGRAMS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(gimp_plug_indir)
--	@list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gimp_plug_indir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gimp_plug_indir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
--	  else :; fi; \
--	done
-+#	$(mkinstalldirs) $(DESTDIR)$(gimp_plug_indir)
-+#	@list='$(gimp_plug_in_PROGRAMS)'; for p in $$list; do \
-+#	  if test -f $$p; then \
-+#	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gimp_plug_indir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+#	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(gimp_plug_indir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+#	  else :; fi; \
-+#	done
- 
- uninstall-gimp_plug_inPROGRAMS:
- 	@$(NORMAL_UNINSTALL)
diff --git a/print/gimp-print/files/patch-src_cups_Makefile.in b/print/gimp-print/files/patch-src_cups_Makefile.in
index 28e4d139d08e..414de5acb6e7 100644
--- a/print/gimp-print/files/patch-src_cups_Makefile.in
+++ b/print/gimp-print/files/patch-src_cups_Makefile.in
@@ -10,18 +10,7 @@ $FreeBSD$
 -DEFS = @CUPS_CFLAGS@ @DEFS@ -I. -I$(srcdir) -I../.. -DCUPS_DATADIR=\"$(pkgdatadir)\" -DGIMP_PRINT_VERSION=\"$(VERSION)\"
 -INCLUDES = @INCLUDES@ $(LIBGIMPPRINT_CFLAGS)
 +DEFS = @DEFS@ -I. -I$(srcdir) -I../.. -DCUPS_DATADIR=\"$(pkgdatadir)\" -DGIMP_PRINT_VERSION=\"$(VERSION)\"
-+INCLUDES = @INCLUDES@ $(LIBGIMPPRINT_CFLAGS) @CUPS_CFLAGS@ 
++INCLUDES = @INCLUDES@ $(LIBGIMPPRINT_CFLAGS) $(CUPS_CFLAGS)
  LIBPRINTUT = $(top_builddir)/lib/libprintut.la
  LIBS = $(INTLLIBS) @LIBS@
  
---- src/cups/Makefile.in.orig	Fri Sep  5 02:16:48 2003
-+++ src/cups/Makefile.in	Fri Sep  5 02:17:15 2003
-@@ -765,7 +765,7 @@
- 	for language in $(LINGUAS) ; do \
- 	  mkdir ppd/$$language ; \
- 	  echo "$$language:" ; \
--	  LANGUAGE=$$language ./genppd --prefix=ppd/$$language --catalog=`pwd`/catalog/share/locale ; \
-+	  LANG=$$language ./genppd --prefix=ppd/$$language --catalog=`pwd`/catalog/share/locale ; \
- 	done
- 	$(RM) -r catalog
- 
diff --git a/print/gimp-print/files/patch-src_main_Makefile.in b/print/gimp-print/files/patch-src_main_Makefile.in
index 47731bf4f97c..1f6e7e4918ed 100644
--- a/print/gimp-print/files/patch-src_main_Makefile.in
+++ b/print/gimp-print/files/patch-src_main_Makefile.in
@@ -1,11 +1,11 @@
---- src/main/Makefile.in.orig	Thu Feb  5 01:35:39 2004
-+++ src/main/Makefile.in	Thu Feb  5 01:36:38 2004
-@@ -223,7 +223,7 @@
+--- src/main/Makefile.in.orig	Fri Jul 16 09:18:56 2004
++++ src/main/Makefile.in	Fri Jul 16 21:15:04 2004
+@@ -200,7 +200,7 @@
  
- DEFS = @DEFS@ -I. -I$(srcdir) -I../..
- CPPFLAGS = @CPPFLAGS@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @INTLLIBS@
- LIBS = @LIBS@
- libgimpprint_la_DEPENDENCIES = 
- libgimpprint_la_OBJECTS =  print-lexmark.lo print-canon.lo \
+ libgimpprint_la_SOURCES =  	gimp-print-internal.h 	print-lexmark.c 	print-canon.c 	print-dither.c 	print-escp2.c 	print-escp2.h 	print-escp2-data.c 	print-pcl.c 	print-ps.c 	print-util.c 	print-color.c 	print-weave.c 	print-version.c 	print-dither-matrices.c 	print-dither.h 	quickmatrix257.h 	ran.367.179.h 	ran.509.131.h
+ 
+-libgimpprint_la_LIBADD = $(GIMPPRINT_DEPLIBS)
++libgimpprint_la_LIBADD = $(GIMPPRINT_DEPLIBS) $(INTLLIBS)
+ # Uncommment to build an unversioned library (version in soname)
+ #libgimpprint_la_LDFLAGS = -release $(GIMPPRINT_VERSION) -rpath $(libdir)
+ # Uncomment to build a versioned library