Upgrade to 1.0, and change sharedlib name to libImlib.

14 files changed, 249 insertions, 523 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 2776c9245125..3f827f5e9c19 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,34 +1,30 @@
-# New ports collection makefile for:   imlib
-# Version required:    0.11
-# Date created:        10 June 1997
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	imlib
+# Version required:	1.0
+# Date created:		10 June 1997
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.11 1997/12/01 16:29:43 vanilla Exp $
+# $Id: Makefile,v 1.12 1998/02/01 02:05:57 vanilla Exp $
 #
 
-DISTNAME=	imlib_DR-0.11
-PKGNAME=	imlib-0.11
+DISTNAME=	Imlib-1.0
+PKGNAME=	imlib-1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mandrake.net/pub/imlib/ \
-		http://www.rasterman.com/ftp/
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/imlib/ \
+		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	png\\.0\\.:${PORTSDIR}/graphics/png \
 		jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
-
 RUN_DEPENDS=	djpeg:${PORTSDIR}/graphics/jpeg \
 		tgatoppm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_GMAKE=	yes
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/imlib
-
-post-patch:
-	$(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat
-	${SED} -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile
+USE_X11=	ues
+GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/imlib/Imlib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 581385f19516..6d0f9ed6b8f3 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib_DR-0.11.tar.gz) = 412989c96bb5aa59feb7df21580e7ee9
+MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 0be556c4addf..ba1d3955d7e5 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,151 +1,35 @@
-*** 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)
+--- configure.orig	Tue Feb 17 17:22:20 1998
++++ configure	Tue Feb 17 17:23:31 1998
+@@ -2462,14 +2462,14 @@
+ echo "********** Disabling libpng support ************"
+ fi
+ 
+-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
+-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
++echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
++ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltiff \
++LIBS="-ltiff34 \
+ -L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
+ -L/usr/openwin/lib -lc -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+@@ -2500,11 +2500,11 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   \
+-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
++extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
+ else
+   echo "$ac_t""no" 1>&6
+ \
+-echo "********** Disabling libtiff support ************"
++echo "********** Disabling libtiff34 support ************"
+ fi
+ 
+ echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
index a8c68075c12d..e4d371cf75ec 100644
--- a/graphics/imlib/files/patch-ab
+++ b/graphics/imlib/files/patch-ab
@@ -1,11 +1,15 @@
---- imlib.h.orig	Mon Dec  1 23:05:14 1997
-+++ imlib.h	Mon Dec  1 23:05:41 1997
-@@ -132,7 +132,7 @@
+--- Imlib_private.h.orig	Tue Feb 17 17:27:25 1998
++++ Imlib_private.h	Tue Feb 17 17:28:06 1998
+@@ -42,10 +42,10 @@
  #include <png.h>
  #endif
  #ifdef BUILTIN_TIFF
 -#include <tiffio.h>
 +#include <tiff34/tiffio.h>
  #endif
+ #ifdef BUILTIN_GIF
+-#include <gif_lib.h>
++#include <giflib/gif_lib.h>
+ #endif
  
- #else /* else LIB_BUILD */
+ #define BYTE_ORD_24_RGB 0
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
new file mode 100644
index 000000000000..fffb498789cd
--- /dev/null
+++ b/graphics/imlib/files/patch-ac
@@ -0,0 +1,79 @@
+--- Makefile.in.orig	Tue Feb 10 07:55:09 1998
++++ Makefile.in	Tue Feb 17 17:49:08 1998
+@@ -29,7 +29,7 @@
+ INSTALL     = @INSTALL@
+ INSTALLBIN  = $(INSTALL) -m 755
+ INSTALLLIB  = $(INSTALL) -m 644
+-SYS_CONFIG  = /etc
++SYS_CONFIG  = /usr/X11R6/etc/imlib
+ 
+ .SUFFIXES:
+ .SUFFIXES: .c .o
+@@ -39,14 +39,14 @@
+ 
+ top_srcdir = @top_srcdir@
+ srcdir     = @srcdir@
+-prefix      = /usr
+-exec_prefix = /usr
++prefix      = /usr/X11R6
++exec_prefix = /usr/X11R6
+ bindir      = $(exec_prefix)/bin
+-datadir     = /usr/lib
+-incdir      = /usr/include
+-libdir      = /usr/lib
+-exe2dir     = /usr/bin
+-mandir      = /usr/man
++datadir     = /usr/X11R6/share
++incdir      = /usr/X11R6/include
++libdir      = /usr/X11R6/lib
++exe2dir     = /usr/X11R6/bin
++mandir      = /usr/X11R6/man
+ 
+ LN_S   = @LN_S@
+ RANLIB = @RANLIB@
+@@ -79,7 +79,7 @@
+ 
+ LIB         = \
+ -lm           \
+--ltiff        \
++-ltiff34      \
+ -ljpeg        \
+ -lpng         \
+ -lgif         \
+@@ -94,6 +94,7 @@
+ @X_LIBS@       \
+ @X_EXTRA_LIBS@ \
+ $(LIB)         \
++-I/usr/local/lib	\
+ $(XLIB)
+ 
+ OPT=                           \
+@@ -110,8 +111,8 @@
+ @CFLAGS@                \
+ @X_CFLAGS@              \
+ -fPIC                   \
+--shared                 \
+ -I.                     \
++-I/usr/local/include	\
+ $(OPT)
+ 
+ all: $(lib)
+@@ -121,6 +122,9 @@
+ 	$(INSTALLBIN) $(lib) $(libdir)/$(lib)
+ 	/bin/ln -sf $(libdir)/$(lib) $(libdir)/$(libname2)
+ 	/bin/ln -sf $(libdir)/$(lib) $(libdir)/$(libname).so
++	if [ ! -d $(SYS_CONFIG) ]; then \
++		mkdir $(SYS_CONFIG); \
++	fi
+ 	$(INSTALL) $(conf_dir)/imrc $(SYS_CONFIG)/imrc
+ 	$(INSTALL) $(conf_dir)/im_palette.pal $(SYS_CONFIG)/im_palette.pal
+ 	$(INSTALL) Imlib.h $(incdir)/Imlib.h
+@@ -146,7 +150,7 @@
+ 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
+ 
+ $(lib): $(OBJS) 
+-	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) -Wl,-soname,$(libname2)
++	ld -Bshareable -o libImlib.so.1.0 $(OBJS) /usr/lib/c++rt0.o
+ 	@echo "--------------------------------------------------------------------------------"
+ 	@echo "Imlib compiled."
+ 	@echo ""
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index f49b2d556810..5956802f3001 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -1,8 +1,9 @@
-include/X11/imlib.h
 etc/imlib/im_palette.pal
 etc/imlib/imrc
-lib/libIm.a
-lib/libIm.so.4.0
-@exec ldconfig -m %B
-man/man3/imlib.3.gz
+include/Imlib.h
+include/Imlib_private.h
+include/Imlib_types.h
+lib/libImlib.so
+lib/libImlib.so.1
+lib/libImlib.so.1.0
 @dirrm etc/imlib
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 2776c9245125..3f827f5e9c19 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -1,34 +1,30 @@
-# New ports collection makefile for:   imlib
-# Version required:    0.11
-# Date created:        10 June 1997
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	imlib
+# Version required:	1.0
+# Date created:		10 June 1997
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.11 1997/12/01 16:29:43 vanilla Exp $
+# $Id: Makefile,v 1.12 1998/02/01 02:05:57 vanilla Exp $
 #
 
-DISTNAME=	imlib_DR-0.11
-PKGNAME=	imlib-0.11
+DISTNAME=	Imlib-1.0
+PKGNAME=	imlib-1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mandrake.net/pub/imlib/ \
-		http://www.rasterman.com/ftp/
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/imlib/ \
+		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	png\\.0\\.:${PORTSDIR}/graphics/png \
 		jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
-
 RUN_DEPENDS=	djpeg:${PORTSDIR}/graphics/jpeg \
 		tgatoppm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_GMAKE=	yes
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/imlib
-
-post-patch:
-	$(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat
-	${SED} -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile
+USE_X11=	ues
+GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/imlib/Imlib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index 581385f19516..6d0f9ed6b8f3 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib_DR-0.11.tar.gz) = 412989c96bb5aa59feb7df21580e7ee9
+MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa
index 0be556c4addf..ba1d3955d7e5 100644
--- a/graphics/imlib2-tmp/files/patch-aa
+++ b/graphics/imlib2-tmp/files/patch-aa
@@ -1,151 +1,35 @@
-*** 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)
+--- configure.orig	Tue Feb 17 17:22:20 1998
++++ configure	Tue Feb 17 17:23:31 1998
+@@ -2462,14 +2462,14 @@
+ echo "********** Disabling libpng support ************"
+ fi
+ 
+-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
+-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
++echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
++ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltiff \
++LIBS="-ltiff34 \
+ -L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
+ -L/usr/openwin/lib -lc -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+@@ -2500,11 +2500,11 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   \
+-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
++extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
+ else
+   echo "$ac_t""no" 1>&6
+ \
+-echo "********** Disabling libtiff support ************"
++echo "********** Disabling libtiff34 support ************"
+ fi
+ 
+ echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index f49b2d556810..5956802f3001 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -1,8 +1,9 @@
-include/X11/imlib.h
 etc/imlib/im_palette.pal
 etc/imlib/imrc
-lib/libIm.a
-lib/libIm.so.4.0
-@exec ldconfig -m %B
-man/man3/imlib.3.gz
+include/Imlib.h
+include/Imlib_private.h
+include/Imlib_types.h
+lib/libImlib.so
+lib/libImlib.so.1
+lib/libImlib.so.1.0
 @dirrm etc/imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 2776c9245125..3f827f5e9c19 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,34 +1,30 @@
-# New ports collection makefile for:   imlib
-# Version required:    0.11
-# Date created:        10 June 1997
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	imlib
+# Version required:	1.0
+# Date created:		10 June 1997
+# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.11 1997/12/01 16:29:43 vanilla Exp $
+# $Id: Makefile,v 1.12 1998/02/01 02:05:57 vanilla Exp $
 #
 
-DISTNAME=	imlib_DR-0.11
-PKGNAME=	imlib-0.11
+DISTNAME=	Imlib-1.0
+PKGNAME=	imlib-1.0
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.mandrake.net/pub/imlib/ \
-		http://www.rasterman.com/ftp/
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/imlib/ \
+		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
 LIB_DEPENDS=	png\\.0\\.:${PORTSDIR}/graphics/png \
 		jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
-
 RUN_DEPENDS=	djpeg:${PORTSDIR}/graphics/jpeg \
 		tgatoppm:${PORTSDIR}/graphics/netpbm \
 		convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_GMAKE=	yes
-USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/imlib
-
-post-patch:
-	$(CP) $(WRKSRC)/Imakefile $(WRKSRC)/Imakefile.pat
-	${SED} -e "s%X11BASE%$(X11BASE)%" <$(WRKSRC)/Imakefile.pat >$(WRKSRC)/Imakefile
+USE_X11=	ues
+GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/imlib/Imlib
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 581385f19516..6d0f9ed6b8f3 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib_DR-0.11.tar.gz) = 412989c96bb5aa59feb7df21580e7ee9
+MD5 (Imlib-1.0.tar.gz) = cc3c3eceb65a2a65e6f4de69bfbe5e18
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
index 0be556c4addf..ba1d3955d7e5 100644
--- a/graphics/imlib2/files/patch-aa
+++ b/graphics/imlib2/files/patch-aa
@@ -1,151 +1,35 @@
-*** 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)
+--- configure.orig	Tue Feb 17 17:22:20 1998
++++ configure	Tue Feb 17 17:23:31 1998
+@@ -2462,14 +2462,14 @@
+ echo "********** Disabling libpng support ************"
+ fi
+ 
+-echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
+-echo "configure:2467: checking for TIFFOpen in -ltiff" >&5
+-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
++echo "configure:2467: checking for TIFFOpen in -ltiff34" >&5
++ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-ltiff \
++LIBS="-ltiff34 \
+ -L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/local/X11/lib \
+ -L/usr/openwin/lib -lc -lm $LIBS"
+ cat > conftest.$ac_ext <<EOF
+@@ -2500,11 +2500,11 @@
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+   \
+-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
++extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
+ else
+   echo "$ac_t""no" 1>&6
+ \
+-echo "********** Disabling libtiff support ************"
++echo "********** Disabling libtiff34 support ************"
+ fi
+ 
+ echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index f49b2d556810..5956802f3001 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,8 +1,9 @@
-include/X11/imlib.h
 etc/imlib/im_palette.pal
 etc/imlib/imrc
-lib/libIm.a
-lib/libIm.so.4.0
-@exec ldconfig -m %B
-man/man3/imlib.3.gz
+include/Imlib.h
+include/Imlib_private.h
+include/Imlib_types.h
+lib/libImlib.so
+lib/libImlib.so.1
+lib/libImlib.so.1.0
 @dirrm etc/imlib