12 files changed, 96 insertions, 160 deletions

diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 1ae7fe824d35..9d55bd13d30c 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -1,32 +1,39 @@
-# New ports collection makefile for:	imlib
-# Date created:		10 June 1997
-# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	imlib2
+# Date created:		16 Oct 2000
+# Whom:			>Jeremy Norris <ishmael27@home.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	imlib
-PORTVERSION=	1.9.8.1
+PORTNAME=	imlib2
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/imlib
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/ \
+		http://www.us.rasterman.com/files/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		edb.1:${PORTSDIR}/databases/edb
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-pre-configure:
-	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if defined(WITH_MMX) && (${ARCH} == "i386")
+CONFIGURE_ARGS=	--enable-mmx
+.endif
+
+post-install:
+	strip ${PREFIX}/lib/libImlib2.so.1
+	strip ${PREFIX}/lib/loaders/filter/*
+	strip ${PREFIX}/lib/loaders/image/*
+.include <bsd.port.post.mk>
diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index 9f05597792ac..9f0c40526503 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599
+MD5 (imlib2-1.0.0.tar.gz) = 72a4a0a0f0bafdb0d220cadb6fce1e84
diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa
deleted file mode 100644
index 03f10b1107b8..000000000000
--- a/graphics/imlib2-tmp/files/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	Sat May 20 14:50:50 2000
-+++ configure	Sun Jul 16 09:56:12 2000
-@@ -2034,8 +2034,8 @@
- if test "x$GDK_IMLIB" != x; then
-   oLIBS="$LIBS"
-   oCFLAGS="$CFLAGS"
--  LIBS="$LIBS `glib-config --libs gmodule`"
--  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+  LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`"
-+  CFLAGS="$CFLAGS `${GLIB_CONFIG} --cflags gmodule`"
-   if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-@@ -2056,7 +2056,7 @@
- EOF
- if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
--  dynworks=true
-+  dynworks=false
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -2085,8 +2085,8 @@
- #define USE_GMODULE 1
- EOF
- 
--   GMODULE_LIBS="`glib-config --libs gmodule`"
--   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+   GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`"
-+   GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`"
-    
-    
-    echo "$ac_t""yes" 1>&6
-@@ -4205,7 +4205,7 @@
-   echo "$ac_t""$jpeg_ok" 1>&6
-   if test "$jpeg_ok" = yes; then 
-     JPEGLIBS="-ljpeg"
--    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
-+    SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF
- #define HAVE_LIBJPEG 1
- EOF
- 
diff --git a/graphics/imlib2-tmp/pkg-comment b/graphics/imlib2-tmp/pkg-comment
index f8f167a8d892..5a71e6e9f493 100644
--- a/graphics/imlib2-tmp/pkg-comment
+++ b/graphics/imlib2-tmp/pkg-comment
@@ -1 +1 @@
-A graphic library for enlightenment package
+The next generation graphic library for enlightenment package
diff --git a/graphics/imlib2-tmp/pkg-descr b/graphics/imlib2-tmp/pkg-descr
index 68d8aa3bd420..8ed9ed14e1b9 100644
--- a/graphics/imlib2-tmp/pkg-descr
+++ b/graphics/imlib2-tmp/pkg-descr
@@ -1 +1,3 @@
-a graphic library for enlightenment package
+The next generation graphic library for enlightenment package.
+
+WWW: http://www.us.rasterman.com/imlib.html
diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index d71d803dc317..fdb31ca43c4a 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -1,20 +1,21 @@
-bin/imlib-config
-bin/imlib_config
-etc/imlib/im_palette-small.pal
-etc/imlib/im_palette-tiny.pal
-etc/imlib/im_palette.pal
-etc/imlib/imrc
-include/Imlib.h
-include/Imlib_private.h
-include/Imlib_types.h
-include/gdk_imlib.h
-include/gdk_imlib_private.h
-include/gdk_imlib_types.h
-lib/libImlib.a
-lib/libImlib.so
-lib/libImlib.so.5
-lib/libgdk_imlib.a
-lib/libgdk_imlib.so
-lib/libgdk_imlib.so.5
-share/aclocal/imlib.m4
-@dirrm etc/imlib
+bin/imlib2-config
+include/Imlib2.h
+lib/libImlib2.a
+lib/libImlib2.so
+lib/libImlib2.so.1
+lib/loaders/filter/bump_map.so
+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
+lib/loaders/image/pnm.so
+lib/loaders/image/tga.so
+lib/loaders/image/tiff.so
+lib/loaders/image/xpm.so
+@dirrm lib/loaders/filter
+@dirrm lib/loaders/image
+@dirrm lib/loaders
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 1ae7fe824d35..9d55bd13d30c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,32 +1,39 @@
-# New ports collection makefile for:	imlib
-# Date created:		10 June 1997
-# Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
+# New ports collection makefile for:	imlib2
+# Date created:		16 Oct 2000
+# Whom:			>Jeremy Norris <ishmael27@home.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	imlib
-PORTVERSION=	1.9.8.1
+PORTNAME=	imlib2
+PORTVERSION=	1.0.0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	stable/sources/imlib
+MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/ \
+		http://www.us.rasterman.com/files/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.ORG
 
 LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
-		ungif.5:${PORTSDIR}/graphics/libungif
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		edb.1:${PORTSDIR}/databases/edb
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-USE_GTK=	yes
+USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/imlib
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-pre-configure:
-	${PERL} -pi -e "s^%%LOCALBASE%%^${LOCALBASE}^" ${WRKSRC}/imlib-config.in
+.include <bsd.port.pre.mk>
 
-.include <bsd.port.mk>
+.if defined(WITH_MMX) && (${ARCH} == "i386")
+CONFIGURE_ARGS=	--enable-mmx
+.endif
+
+post-install:
+	strip ${PREFIX}/lib/libImlib2.so.1
+	strip ${PREFIX}/lib/loaders/filter/*
+	strip ${PREFIX}/lib/loaders/image/*
+.include <bsd.port.post.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 9f05597792ac..9f0c40526503 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599
+MD5 (imlib2-1.0.0.tar.gz) = 72a4a0a0f0bafdb0d220cadb6fce1e84
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
deleted file mode 100644
index 03f10b1107b8..000000000000
--- a/graphics/imlib2/files/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.orig	Sat May 20 14:50:50 2000
-+++ configure	Sun Jul 16 09:56:12 2000
-@@ -2034,8 +2034,8 @@
- if test "x$GDK_IMLIB" != x; then
-   oLIBS="$LIBS"
-   oCFLAGS="$CFLAGS"
--  LIBS="$LIBS `glib-config --libs gmodule`"
--  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+  LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`"
-+  CFLAGS="$CFLAGS `${GLIB_CONFIG} --cflags gmodule`"
-   if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-@@ -2056,7 +2056,7 @@
- EOF
- if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
--  dynworks=true
-+  dynworks=false
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -2085,8 +2085,8 @@
- #define USE_GMODULE 1
- EOF
- 
--   GMODULE_LIBS="`glib-config --libs gmodule`"
--   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+   GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`"
-+   GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`"
-    
-    
-    echo "$ac_t""yes" 1>&6
-@@ -4205,7 +4205,7 @@
-   echo "$ac_t""$jpeg_ok" 1>&6
-   if test "$jpeg_ok" = yes; then 
-     JPEGLIBS="-ljpeg"
--    SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
-+    SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF
- #define HAVE_LIBJPEG 1
- EOF
- 
diff --git a/graphics/imlib2/pkg-comment b/graphics/imlib2/pkg-comment
index f8f167a8d892..5a71e6e9f493 100644
--- a/graphics/imlib2/pkg-comment
+++ b/graphics/imlib2/pkg-comment
@@ -1 +1 @@
-A graphic library for enlightenment package
+The next generation graphic library for enlightenment package
diff --git a/graphics/imlib2/pkg-descr b/graphics/imlib2/pkg-descr
index 68d8aa3bd420..8ed9ed14e1b9 100644
--- a/graphics/imlib2/pkg-descr
+++ b/graphics/imlib2/pkg-descr
@@ -1 +1,3 @@
-a graphic library for enlightenment package
+The next generation graphic library for enlightenment package.
+
+WWW: http://www.us.rasterman.com/imlib.html
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index d71d803dc317..fdb31ca43c4a 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,20 +1,21 @@
-bin/imlib-config
-bin/imlib_config
-etc/imlib/im_palette-small.pal
-etc/imlib/im_palette-tiny.pal
-etc/imlib/im_palette.pal
-etc/imlib/imrc
-include/Imlib.h
-include/Imlib_private.h
-include/Imlib_types.h
-include/gdk_imlib.h
-include/gdk_imlib_private.h
-include/gdk_imlib_types.h
-lib/libImlib.a
-lib/libImlib.so
-lib/libImlib.so.5
-lib/libgdk_imlib.a
-lib/libgdk_imlib.so
-lib/libgdk_imlib.so.5
-share/aclocal/imlib.m4
-@dirrm etc/imlib
+bin/imlib2-config
+include/Imlib2.h
+lib/libImlib2.a
+lib/libImlib2.so
+lib/libImlib2.so.1
+lib/loaders/filter/bump_map.so
+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
+lib/loaders/image/pnm.so
+lib/loaders/image/tga.so
+lib/loaders/image/tiff.so
+lib/loaders/image/xpm.so
+@dirrm lib/loaders/filter
+@dirrm lib/loaders/image
+@dirrm lib/loaders