Update to 0.11

6 files changed, 162 insertions, 86 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index c2e64ab1b544..d8d733124371 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:   imlib
-# Version required:    0.7
+# Version required:    0.11
 # Date created:        10 June 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.8 1997/11/04 03:57:54 asami Exp $
+# $Id: Makefile,v 1.9 1997/11/16 09:59:11 fenner Exp $
 #
 
-DISTNAME=	imlib_DR-0.7
-PKGNAME=	imlib-0.7
+DISTNAME=	imlib_DR-0.11
+PKGNAME=	imlib-0.11
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://cthulhu.mandrake.net/pub/imlib/ \
 		http://www.rasterman.com/ftp/
 
 MAINTAINER=	vanilla@MinJe.com.TW
 
+LIB_DEPENDS=	png\\.0\\.:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	djpeg:${PORTSDIR}/graphics/jpeg \
 		tgatoppm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
@@ -22,8 +23,6 @@ USE_GMAKE=	yes
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/imlib
 
-MAN3=		imlib.3x
-
 post-patch:
 	$(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat
 	${SED} -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index d8917637a0ad..581385f19516 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib_DR-0.7.tar.gz) = dac6e7501fd668704155b37c43484bed
+MD5 (imlib_DR-0.11.tar.gz) = 412989c96bb5aa59feb7df21580e7ee9
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index f0b9306f3451..0be556c4addf 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,50 +1,151 @@
---- 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()
+*** Imlib.tmpl.orig	Tue Nov 25 08:18:26 1997
+--- Imlib.tmpl	Thu Nov 27 04:17:35 1997
+***************
+*** 5,18 ****
+  XCOMM	----------------------------
+  XCOMM	The root directory of where the installation will put include and lib.
+  
+! IMLROOT	= /usr/X11
+  
+  XCOMM	imlib custom configuration file
+  XCOMM	--------------------------------
+  XCOMM	Change the following to where you would like imrc and imlib.pal 
+  XCOMM	to be loaded
+  
+! CNFDIR = /etc
+  
+  XCOMM	Location of the NetPBM Utilities
+  XCOMM	--------------------------------
+--- 5,18 ----
+  XCOMM	----------------------------
+  XCOMM	The root directory of where the installation will put include and lib.
+  
+! IMLROOT	= ${X11BASE}
+  
+  XCOMM	imlib custom configuration file
+  XCOMM	--------------------------------
+  XCOMM	Change the following to where you would like imrc and imlib.pal 
+  XCOMM	to be loaded
+  
+! CNFDIR = ${X11BASE}/etc/imlib
+  
+  XCOMM	Location of the NetPBM Utilities
+  XCOMM	--------------------------------
+***************
+*** 25,31 ****
+  #ifdef	SunArchitecture
+  NETPBM_DIR = /usr/openwin/bin
+  #else
+! NETPBM_DIR = /usr/local/bin
+  #endif
+  
+  XCOMM	Location of the IJG JPEG Utilities
+--- 25,31 ----
+  #ifdef	SunArchitecture
+  NETPBM_DIR = /usr/openwin/bin
+  #else
+! NETPBM_DIR = ${X11BASE}/bin
+  #endif
+  
+  XCOMM	Location of the IJG JPEG Utilities
+***************
+*** 33,39 ****
+  XCOMM	imlib needs convert and djpeg from the IJG.  This is the location
+  XCOMM	of those files.
+  
+! CONVERT_DIR = /usr/local/bin
+  JPEG_DIR = /usr/local/bin
+  
+  XCOMM	JPEG Library Support
+--- 33,39 ----
+  XCOMM	imlib needs convert and djpeg from the IJG.  This is the location
+  XCOMM	of those files.
+  
+! CONVERT_DIR = ${X11BASE}/bin
+  JPEG_DIR = /usr/local/bin
+  
+  XCOMM	JPEG Library Support
+***************
+*** 41,47 ****
+  XCOMM	imlib can use the IJG JPEG library (libjpeg) directly.  If you
+  XCOMM	wish to compile this in, set this to YES.
+  
+! #define DoJPEG  NO
+  
+  XCOMM   PNG Library Support
+  XCOMM   --------------------
+--- 41,47 ----
+  XCOMM	imlib can use the IJG JPEG library (libjpeg) directly.  If you
+  XCOMM	wish to compile this in, set this to YES.
+  
+! #define DoJPEG  YES
+  
+  XCOMM   PNG Library Support
+  XCOMM   --------------------
+***************
+*** 49,62 ****
+  XCOMM	If you wish to compile this in, set this to YES.
+  XCOMM	[NOTE:  This library requires libz be availabel too.]
+  
+! #define DoPNG  NO
+  
+  XCOMM   TIFF Library Support
+  XCOMM   --------------------
+  XCOMM   imlib can use the TIFF library (libtiff) directly.  If you
+  XCOMM   wish to compile this in, set this to YES.
+  
+! #define DoTIFF  NO
+  
+  XCOMM	Shared Library Support
+  XCOMM	----------------------
+--- 49,62 ----
+  XCOMM	If you wish to compile this in, set this to YES.
+  XCOMM	[NOTE:  This library requires libz be availabel too.]
+  
+! #define DoPNG  YES
+  
+  XCOMM   TIFF Library Support
+  XCOMM   --------------------
+  XCOMM   imlib can use the TIFF library (libtiff) directly.  If you
+  XCOMM   wish to compile this in, set this to YES.
+  
+! #define DoTIFF  YES
+  
+  XCOMM	Shared Library Support
+  XCOMM	----------------------
+***************
+*** 94,100 ****
+  
+  XCOMM   GNU C v2.xxx flags
+  #if HasGcc2
+! USR_FLAGS = -Wall -pedantic
+  
+  XCOMM   Solaris v2.6 or Solaris v2.x
+  #elif defined(HasSunC) || defined(SunArchitecture) && defined(SVR4)    
+--- 94,100 ----
+  
+  XCOMM   GNU C v2.xxx flags
+  #if HasGcc2
+! USR_FLAGS += -Wall -pedantic
+  
+  XCOMM   Solaris v2.6 or Solaris v2.x
+  #elif defined(HasSunC) || defined(SunArchitecture) && defined(SVR4)    
+*** Imakefile.orig	Tue Nov 25 08:38:34 1997
+--- Imakefile	Thu Nov 27 04:14:06 1997
+***************
+*** 21,27 ****
+  XCOMM   Library we are building and the revision
+  
+  IMLLIBNAME=Im
+! IMLLIBREV=0.11
+  
+  XCOMM	These are the directories we are going to also run imake and make in.
+  XCOMM	IHaveSubdirs tells imake to actually look at $(SUBDIRS)
+--- 21,27 ----
+  XCOMM   Library we are building and the revision
+  
+  IMLLIBNAME=Im
+! IMLLIBREV=4.0
+  
+  XCOMM	These are the directories we are going to also run imake and make in.
+  XCOMM	IHaveSubdirs tells imake to actually look at $(SUBDIRS)
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
deleted file mode 100644
index 9c8b8b560b8c..000000000000
--- a/graphics/imlib/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 39da72c52153..000000000000
--- a/graphics/imlib/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index ec590a86a962..f49b2d556810 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -1,8 +1,8 @@
 include/X11/imlib.h
+etc/imlib/im_palette.pal
+etc/imlib/imrc
 lib/libIm.a
-lib/libIm.so.3.7
+lib/libIm.so.4.0
 @exec ldconfig -m %B
-lib/X11/enlightenment/im_palette.pal
-lib/X11/enlightenment/imrc
-man/man3/imlib.3x.gz
-@dirrm lib/X11/enlightenment
+man/man3/imlib.3.gz
+@dirrm etc/imlib