Update to 0.7

PR:		ports/5030
Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

3 files changed, 74 insertions, 89 deletions

diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index cb4097e121b5..f0b9306f3451 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,68 +1,50 @@
-*** Imakefile.orig	Thu Aug 28 20:36:09 1997
---- Imakefile	Fri Sep 19 03:29:21 1997
-***************
-*** 6,27 ****
-  /* ---------------------------------------------------------------- */
-  
-  LIBNAME=Im
-! LIBREV=1.0
-  
-! CONVERT_DIR=/usr/bin
-! NETPBM_DIR=/usr/bin
-  
-  #ifdef UseEtcX11
-  ETCDIR=/etc/X11/$(LIBNAME)
-  #else
-! ETCDIR=/etc
-  #endif /* def UseEtcX11 */
-  
-  CNFDIR = $(ETCDIR)
-  
-  DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-            -DCONVERT_PATH=\"$(CONVERT_DIR)\" \
-! 	  -DNETPBM_PATH=\"$(NETPBM_DIR)\"
-  
-  SRCS = load.c rend.c misc.c colors.c cache.c
-  OBJS = load.o rend.o misc.o colors.o cache.o
---- 6,29 ----
-  /* ---------------------------------------------------------------- */
-  
-  LIBNAME=Im
-! LIBREV=3.0
-  
-! CONVERT_DIR=/usr/X11R6/bin
-! NETPBM_DIR=/usr/X11R6/bin
-! JPEG_DIR=/usr/local/bin
-  
-  #ifdef UseEtcX11
-  ETCDIR=/etc/X11/$(LIBNAME)
-  #else
-! ETCDIR=/usr/X11R6/lib/X11/enlightenment
-  #endif /* def UseEtcX11 */
-  
-  CNFDIR = $(ETCDIR)
-  
-  DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-            -DCONVERT_PATH=\"$(CONVERT_DIR)\" \
-! 	  -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
-! 	  -DJPEG_PATH=\"$(JPEG_DIR)\"
-  
-  SRCS = load.c rend.c misc.c colors.c cache.c
-  OBJS = load.o rend.o misc.o colors.o cache.o
-*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
-*** 64,70 ****
-  CNFSRC = ./sys_conf
-  CNFS = $(CNFSRC)/imrc 
-  PALS = $(CNFSRC)/im_palette.pal
-! CNFFLAGS = -m 0644 -o root -g root
-  InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
-  
-  DependTarget()
---- 66,72 ----
-  CNFSRC = ./sys_conf
-  CNFS = $(CNFSRC)/imrc 
-  PALS = $(CNFSRC)/im_palette.pal
-! CNFFLAGS = -m 0644 -o root -g wheel
-  InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
-  
-  DependTarget()
+--- Imakefile.orig	Thu Nov 13 08:41:48 1997
++++ Imakefile	Thu Nov 13 13:37:47 1997
+@@ -3,28 +3,30 @@
+ /*#define UseEtcX11	 /* */
+ 
+ /* change this if the INSTALL script didn't get it right */
+-CONVERT_DIR=/usr/local/bin
+-NETPBM_DIR=/usr/local/bin
++CONVERT_DIR=/usr/X11R6/bin
++NETPBM_DIR=/usr/X11R6/bin
++JPEG_DIR=/usr/local/bin
+ 
+ /* change these if you don't like them */
+-INCDIR=/usr/X11/include/X11/
+-LIBDIR=/usr/X11/lib/
+-MANDIR=/usr/X11/man/man3/
++INCDIR=/usr/X11R6/include/X11/
++LIBDIR=/usr/X11R6/lib/
++MANDIR=/usr/X11R6/man/man3/
+ 
+ LIBNAME=Im
+-LIBREV=0.7
++LIBREV=3.7
+ 
+ #ifdef UseEtcX11
+ ETCDIR=/etc/X11/$(LIBNAME)
+ #else
+-ETCDIR=/etc
++ETCDIR=/usr/X11R6/lib/X11/enlightenment
+ #endif /* def UseEtcX11 */
+ 
+ CNFDIR = $(ETCDIR)
+ 
+ DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
+           -DCONVERT_PATH=\"$(CONVERT_DIR)\" \
+-	  -DNETPBM_PATH=\"$(NETPBM_DIR)\"
++	  -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
++	  -DJPEG_PATH=\"$(JPEG_DIR)\"
+ 
+ SRCS = load.c rend.c misc.c colors.c cache.c
+ OBJS = load.o rend.o misc.o colors.o cache.o
+@@ -72,7 +74,7 @@
+ CNFSRC = ./sys_conf
+ CNFS = $(CNFSRC)/imrc 
+ PALS = $(CNFSRC)/im_palette.pal
+-CNFFLAGS = -m 0644 -o root -g root
++CNFFLAGS = -m 0644 -o root -g wheel
+ InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
+ 
+ DependTarget()
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
new file mode 100644
index 000000000000..9c8b8b560b8c
--- /dev/null
+++ b/graphics/imlib/files/patch-ab
@@ -0,0 +1,13 @@
+--- load.c.orig	Wed Nov  5 20:10:50 1997
++++ load.c	Wed Nov 12 18:00:19 1997
+@@ -159,8 +159,8 @@
+ 	     if (needs_conv) pclose(p);
+ 	     else fclose(p);
+ 	  }
+-	if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, fil);
+-	else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, fil);
++	if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, fil);
++	else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, fil);
+ 	else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, fil);
+ 	else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, fil);
+ 	else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, fil);
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 5cac445ec737..39da72c52153 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -1,21 +1,11 @@
-*** load.c.orig	Fri Sep 19 03:24:04 1997
---- load.c	Fri Sep 19 03:25:28 1997
-*************** Image *ImlibLoadImage(ImlibData *id, cha
-*** 157,164 ****
-  	     if (needs_conv) pclose(p);
-  	     else fclose(p);
-  	  }
-! 	if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file);
-! 	else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file);
-  	else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file);
-  	else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
-  	else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
---- 157,164 ----
-  	     if (needs_conv) pclose(p);
-  	     else fclose(p);
-  	  }
-! 	if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file);
-! 	else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file);
-  	else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file);
-  	else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
-  	else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
+--- sys_conf.dist/imrc.orig	Tue Nov  4 12:11:30 1997
++++ sys_conf.dist/imrc	Thu Nov 13 13:05:34 1997
+@@ -55,7 +55,7 @@
+ # these pixmaps themselves, because this will trample all over the cache
+ # and give very horrid effects, or even make the apps crash with segfaults or
+ # Xlib errors.
+-Pixmap_Cache                      on
++Pixmap_Cache                      off
+ # Pixmap cache is in **-> BITS <-**... the end result is APPROXIMATELY
+ # 10000000 bits of pixmap make your Xserver grow by 1Mb of RAM (VERY rough).
+ # As wiht any cache, the more, the better. The more you have, the less likely