Bring imlib up to date, for the enlightenment port.

Submitted by:	Vanill I. Shu <vanilla@MinJe.com.TW>

5 files changed, 23 insertions, 40 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 1e7fedd74b72..fec4d8e2ad0c 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,25 +1,25 @@
 # New ports collection makefile for:   imlib
-# Version required:    0.1
-# Date created:        10 June 1997
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# Version required:    0.4
+# Date created:        18 August 1997
+# Whom:                Vanill I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/06/03 23:39:10 asami Exp $
 #
 
-DISTNAME=	imlib
-PKGNAME=	imlib-0.1
+DISTNAME=	imlib_DR-0.4
+PKGNAME=	imlib-0.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.cse.unsw.edu.au/pub/users/s2154962/
-DISTFILES=	imlib_DR-0.1.tar.gz
+MASTER_SITES=	ftp://cthulhu.mandrake.net/pub/enlightenment/
 
-MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
-
-RUN_DEPENDS=	tgatoppm:${PORTSDIR}/graphics/netpbm \
-		djpeg:${PORTSDIR}/graphics/jpeg \
-		convert:${PORTSDIR}/graphics/ImageMagick
+MAINTAINER=	Vanill I. Shu <vanilla@MinJe.com.TW>
 
 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
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 2805708d6976..c5c34c9fab21 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib_DR-0.1.tar.gz) = ab4d7e66f893d4b695b7a4e3c982d353
+MD5 (imlib_DR-0.4.tar.gz) = a8b0d03bd598210d687614c306315a16
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index 42914fe5f25f..de4d8f543fda 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,6 +1,6 @@
-*** Imakefile.orig	Fri May  9 01:33:37 1997
---- Imakefile	Sun May 25 15:32:25 1997
-***************
+*** Imakefile.orig	Fri Aug 15 16:15:58 1997
+--- Imakefile	Fri Aug 15 16:16:29 1997
+*************** LIBREV=1.0
 *** 11,17 ****
   #ifdef UseEtcX11
   ETCDIR=/etc/X11/$(LIBNAME)
@@ -13,11 +13,11 @@
   #ifdef UseEtcX11
   ETCDIR=/etc/X11/$(LIBNAME)
   #else
-! ETCDIR=/usr/X11R6/lib/X11/enlightenment
+! ETCDIR=X11BASE/lib/X11/enlightenment
   #endif /* def UseEtcX11 */
   
   CNFDIR = $(ETCDIR)
-***************
+*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
 *** 59,65 ****
   CNFSRC = ./sys_conf
   CNFS = $(CNFSRC)/imrc 
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
deleted file mode 100644
index 627f80332b0e..000000000000
--- a/graphics/imlib/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-*** sys_conf.dist/imrc.orig	Sun May 25 15:38:42 1997
---- sys_conf.dist/imrc	Sun May 25 15:39:09 1997
-***************
-*** 5,11 ****
-  # The file that contains palette entries for a golbal palette for all Imlib
-  # based programs.
-  # options: full path to palette file
-! PaletteFile                       /etc/im_palette.pal
-  # This defines if when the display is greater than 8 bit, that is still remaps
-  # the images to the palette defined, rather than using "perfect" rendering
-  # options: yes/no
---- 5,11 ----
-  # The file that contains palette entries for a golbal palette for all Imlib
-  # based programs.
-  # options: full path to palette file
-! PaletteFile                       /usr/X11R6/lib/X11/enlightenment/im_palette.pal
-  # This defines if when the display is greater than 8 bit, that is still remaps
-  # the images to the palette defined, rather than using "perfect" rendering
-  # options: yes/no
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index f26ddde5e66c..7346125e563e 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -1,4 +1,6 @@
-lib/X11/enlightenment/im_palette.pal
-lib/X11/enlightenment/imrc
+include/X11/imlib.h
 lib/libIm.a
 lib/libIm.so.1.0
+@exec ldconfig -m %B
+lib/X11/enlightenment/im_palette.pal
+lib/X11/enlightenment/imrc