7 files changed, 202 insertions, 17 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f7ed5855b0c4..a2ef2c67df94 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.4
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://www.ny.us.rasterman.com/files/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
 
 MAINTAINER=	ishmael27@home.com
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		ltdl.1:${PORTSDIR}/devel/libtool \
+		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		edb.1:${PORTSDIR}/databases/edb
+		ungif.5:${PORTSDIR}/graphics/libungif
 
 USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
@@ -35,13 +36,4 @@ CONFIGURE_ARGS=	--enable-mmx
 post-configure:
 	@${PERL} -pi -e 's|\@localbase\@|${LOCALBASE}|g' ${WRKSRC}/imlib2-config
 
-post-install:
-	@strip ${PREFIX}/lib/libImlib2.so.1
-.for i in bump_map colormod testfilter
-	@strip ${PREFIX}/lib/loaders/filter/${i}.so
-.endfor
-.for i in argb bmp db gif jpeg png pnm tga tiff xpm
-	@strip ${PREFIX}/lib/loaders/image/${i}.so
-.endfor
-
 .include <bsd.port.post.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index a8bae82d4812..358ef136dcbf 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib2-1.0.3.tar.gz) = f5f926aba293cf3982062decb02b1df9
+MD5 (imlib2-1.0.4.tar.gz) = 8b1a7f76734f85722a01672349f67d3e
diff --git a/graphics/imlib2/files/patch-Makefile.in b/graphics/imlib2/files/patch-Makefile.in
new file mode 100644
index 000000000000..dbcada323685
--- /dev/null
+++ b/graphics/imlib2/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Sep 21 12:31:03 2001
++++ Makefile.in	Sun Oct  7 17:26:29 2001
+@@ -93,7 +93,7 @@
+ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess 		       config.h.in config.sub configure install-sh 		       ltconfig ltmain.sh missing mkinstalldirs 		       stamp-h.in
+ 
+ 
+-SUBDIRS = libltdl src filters doc loaders
++SUBDIRS = src filters doc loaders
+ 
+ bin_SCRIPTS = imlib2-config
+ 
diff --git a/graphics/imlib2/files/patch-configure b/graphics/imlib2/files/patch-configure
new file mode 100644
index 000000000000..2452f649c284
--- /dev/null
+++ b/graphics/imlib2/files/patch-configure
@@ -0,0 +1,95 @@
+--- configure.orig	Wed Aug 29 21:48:58 2001
++++ configure	Sun Oct  7 17:23:22 2001
+@@ -1031,16 +1031,6 @@
+ fi
+ 	      
+ 
+-  case "$enable_ltdl_convenience" in
+-  no) { echo "configure: error: this package needs a convenience libltdl" 1>&2; exit 1; } ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/''libltdl'/libltdlc.la
+-  INCLTDL='-I${top_srcdir}/''libltdl'
+-
+-subdirs="libltdl"
+-
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+@@ -4313,75 +4303,5 @@
+     esac
+   done
+ 
+-  for ac_config_dir in libltdl; do
+-
+-    # Do not complain, so a configure script can configure whichever
+-    # parts of a large source tree are present.
+-    if test ! -d $srcdir/$ac_config_dir; then
+-      continue
+-    fi
+-
+-    echo configuring in $ac_config_dir
+-
+-    case "$srcdir" in
+-    .) ;;
+-    *)
+-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+-      else
+-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+-      fi
+-      ;;
+-    esac
+-
+-    ac_popdir=`pwd`
+-    cd $ac_config_dir
+-
+-      # A "../" for each directory in /$ac_config_dir.
+-      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+-
+-    case "$srcdir" in
+-    .) # No --srcdir option.  We are building in place.
+-      ac_sub_srcdir=$srcdir ;;
+-    /*) # Absolute path.
+-      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+-    *) # Relative path.
+-      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+-    esac
+-
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_sub_srcdir/configure; then
+-      ac_sub_configure=$ac_sub_srcdir/configure
+-    elif test -f $ac_sub_srcdir/configure.in; then
+-      ac_sub_configure=$ac_configure
+-    else
+-      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+-      ac_sub_configure=
+-    fi
+-
+-    # The recursion is here.
+-    if test -n "$ac_sub_configure"; then
+-
+-      # Make the cache file name correct relative to the subdirectory.
+-      case "$cache_file" in
+-      /*) ac_sub_cache_file=$cache_file ;;
+-      *) # Relative path.
+-        ac_sub_cache_file="$ac_dots$cache_file" ;;
+-      esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
+-
+-      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+-      # The eval makes quoting arguments work.
+-      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+-      then :
+-      else
+-        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+-      fi
+-    fi
+-
+-    cd $ac_popdir
+-  done
+ fi
+ 
diff --git a/graphics/imlib2/files/patch-src::Makefile.in b/graphics/imlib2/files/patch-src::Makefile.in
new file mode 100644
index 000000000000..9912ca392a04
--- /dev/null
+++ b/graphics/imlib2/files/patch-src::Makefile.in
@@ -0,0 +1,86 @@
+--- src/Makefile.in.orig	Fri Sep 21 12:31:03 2001
++++ src/Makefile.in	Sun Oct  7 18:25:33 2001
+@@ -93,7 +93,7 @@
+ MAINTAINERCLEANFILES = Makefile.in loaderpath.h
+ 
+ LDFLAGS = -L/usr/X11R6/lib
+-INCLUDES = -I/usr/X11R6/include -I$(top_srcdir)/libltdl                        $(X_CFLAGS) -I$(prefix)/include -I$(includedir) 		       -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders
++INCLUDES = -I/usr/X11R6/include $(X_CFLAGS) -I$(prefix)/include -I$(includedir) 		       -I. -I$(top_srcdir) -I$(top_srcdir)/src 		       -I$(top_srcdir)/loaders
+ 
+ MMX_SRCS = asm_blend.S asm_rgba.S asm_scale.S asm_rotate.S 		       asm_blend_cmod.S
+ 
+@@ -107,8 +107,8 @@
+ EXTRA_libImlib2_la_SOURCES = rend.c ximage.c rgba.c color.c grab.c draw.c 			     context.c color.h context.h draw.h grab.h rend.h 			     rgba.h ximage.h $(MMX_SRCS)
+ 
+ libImlib2_la_LDFLAGS = -version-info 1:4:0
+-@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS)                        $(top_builddir)/libltdl/libltdlc.la                        $(x_libs) -lttf $(LDFLAGS)
+-@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@                        $(top_builddir)/libltdl/libltdlc.la                        $(x_libs) -lttf $(LDFLAGS)
++@HAVE_MMX_TRUE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ $(MMX_OBJS) -lltdl                        $(x_libs) -lttf $(LDFLAGS)
++@HAVE_MMX_FALSE@libImlib2_la_LIBADD = $(X_OBJS) @DLLDFLAGS@ -lltdl                        $(x_libs) -lttf $(LDFLAGS)
+ @HAVE_MMX_TRUE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS) $(MMX_OBJS)
+ @HAVE_MMX_FALSE@libImlib2_la_DEPENDENCIES = $(top_builddir)/config.h $(X_OBJS)
+ 
+@@ -283,48 +283,48 @@
+ 	  fi; \
+ 	done
+ api.lo api.o : api.c ../config.h common.h colormod.h image.h \
+-	../libltdl/ltdl.h scale.h blend.h context.h color.h grab.h \
++	scale.h blend.h context.h color.h grab.h \
+ 	rend.h rgba.h ximage.h draw.h file.h updates.h rgbadraw.h \
+ 	Imlib2.h font.h grad.h rotate.h filter.h dynamic_filters.h \
+ 	script.h color_helpers.h
+ blend.lo blend.o : blend.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h blend.h scale.h
++	blend.h scale.h
+ color.lo color.o : color.c common.h ../config.h color.h
+ color_helpers.lo color_helpers.o : color_helpers.c color_helpers.h
+ colormod.lo colormod.o : colormod.c common.h ../config.h colormod.h \
+-	image.h ../libltdl/ltdl.h file.h loaderpath.h blend.h
++	image.h file.h loaderpath.h blend.h
+ context.lo context.o : context.c common.h ../config.h image.h \
+-	../libltdl/ltdl.h context.h color.h rgba.h
++	context.h color.h rgba.h
+ draw.lo draw.o : draw.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h blend.h rend.h draw.h
++	blend.h rend.h draw.h
+ dynamic_filters.lo dynamic_filters.o : dynamic_filters.c common.h \
+-	../config.h image.h ../libltdl/ltdl.h file.h dynamic_filters.h \
++	../config.h image.h file.h dynamic_filters.h \
+ 	script.h Imlib2.h loaderpath.h
+ file.lo file.o : file.c common.h ../config.h file.h
+ filter.lo filter.o : filter.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h blend.h filter.h
++	blend.h filter.h
+ font.lo font.o : font.c ../config.h common.h colormod.h image.h \
+-	../libltdl/ltdl.h blend.h font.h file.h updates.h rgbadraw.h \
++	blend.h font.h file.h updates.h rgbadraw.h \
+ 	rotate.h
+ format.lo format.o : format.c format.h
+ grab.lo grab.o : grab.c common.h ../config.h grab.h
+ grad.lo grad.o : grad.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h file.h loaderpath.h blend.h grad.h \
++	file.h loaderpath.h blend.h grad.h \
+ 	color_helpers.h
+ image.lo image.o : image.c common.h ../config.h image.h \
+-	../libltdl/ltdl.h file.h loaderpath.h
++	file.h loaderpath.h
+ rend.lo rend.o : rend.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h scale.h ximage.h context.h rgba.h color.h \
++	scale.h ximage.h context.h rgba.h color.h \
+ 	grab.h blend.h rend.h rotate.h
+ rgba.lo rgba.o : rgba.c common.h ../config.h context.h rgba.h
+ rgbadraw.lo rgbadraw.o : rgbadraw.c common.h ../config.h colormod.h \
+-	image.h ../libltdl/ltdl.h scale.h blend.h updates.h rgbadraw.h
++	image.h scale.h blend.h updates.h rgbadraw.h
+ rotate.lo rotate.o : rotate.c common.h ../config.h rotate.h image.h \
+-	../libltdl/ltdl.h colormod.h blend.h
++	colormod.h blend.h
+ scale.lo scale.o : scale.c common.h ../config.h colormod.h image.h \
+-	../libltdl/ltdl.h blend.h scale.h
++	blend.h scale.h
+ script.lo script.o : script.c common.h ../config.h Imlib2.h image.h \
+-	../libltdl/ltdl.h file.h dynamic_filters.h script.h \
++	file.h dynamic_filters.h script.h \
+ 	loaderpath.h
+ updates.lo updates.o : updates.c common.h ../config.h updates.h
+ ximage.lo ximage.o : ximage.c common.h ../config.h ximage.h
diff --git a/graphics/imlib2/pkg-descr b/graphics/imlib2/pkg-descr
index 05bfa429048d..fe4a457f32a9 100644
--- a/graphics/imlib2/pkg-descr
+++ b/graphics/imlib2/pkg-descr
@@ -1 +1,3 @@
 The next generation graphic library for enlightenment package.
+
+WWW: http://www.enlightenment.org/pages/imlib2.html
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index fdb31ca43c4a..6a267334c19a 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -8,7 +8,6 @@ lib/loaders/filter/colormod.so
 lib/loaders/filter/testfilter.so
 lib/loaders/image/argb.so
 lib/loaders/image/bmp.so
-lib/loaders/image/db.so
 lib/loaders/image/gif.so
 lib/loaders/image/jpeg.so
 lib/loaders/image/png.so