Upgrade to 1.2.1.

5 files changed, 5 insertions, 339 deletions

diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 08e5cd2f7e0d..06b5631603d6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.2.1
+PORTREVISION=	0
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	enlightenment
+MASTER_SITES=	http://enlightenment.freedesktop.org/files/
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The next generation graphic library for enlightenment package
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 6bd1ca660015..3fbb8f47a474 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,2 +1,2 @@
-MD5 (imlib2-1.2.0.tar.gz) = 853fb77100ee3c3ca944f52c892ab49b
-SIZE (imlib2-1.2.0.tar.gz) = 890457
+MD5 (imlib2-1.2.1.tar.gz) = e32970d03d8aee2885782312d0a7f15f
+SIZE (imlib2-1.2.1.tar.gz) = 899631
diff --git a/graphics/imlib2/files/patch-configure.in b/graphics/imlib2/files/patch-configure.in
deleted file mode 100644
index b2219d63d4d1..000000000000
--- a/graphics/imlib2/files/patch-configure.in
+++ /dev/null
@@ -1,121 +0,0 @@
---- configure.in.orig	Wed Jan  5 01:39:08 2005
-+++ configure.in	Sun Feb 27 21:16:57 2005
-@@ -6,7 +6,7 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- AC_ISC_POSIX
--AM_INIT_AUTOMAKE(imlib2, 1.2.0)
-+AM_INIT_AUTOMAKE(imlib2, 1.2.0.001)
- AM_CONFIG_HEADER(config.h)
- 
- AC_C_BIGENDIAN
-@@ -86,6 +86,9 @@
- packagesrcdir=`cd $srcdir && pwd`
- AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
- 
-+# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
-+requirements="freetype2"
-+
- mmx=no
- AC_ARG_ENABLE(mmx,[  --disable-mmx           attempt compiling using mmx assembly [default=yes]],
- [
-@@ -98,15 +101,16 @@
-   fi
- ],
- [
--if test x$target_os = xlinux-gnu; then
-+if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
-   if test x$target_cpu = x$host_cpu; then
-     mmx=`cat /proc/cpuinfo | grep mmx`
-     if test -n "$mmx"; then
-       mmx=yes
-+      echo "You appear to be compiling on a "$target_cpu/$target_os" system; using MMX."
-     fi
-   else
-     echo ""
--    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
-+    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_cpu/$target_os" machine."
-     echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
-     echo "configure option."
-     echo ""
-@@ -114,6 +118,7 @@
- else
-   echo ""
-   echo "You are not running Linux - This script cannot auto-detect mmx assembly."
-+  echo "(You appear to be running $target_os.)"
-   echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
-   echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
-   echo ""
-@@ -139,35 +144,28 @@
- freetype_cflags=`$FREETYPE_CONFIG --cflags`
- freetype_libs=`$FREETYPE_CONFIG --libs`
- 
--x11=no
--AC_ARG_ENABLE(x11,[  --disable-x11           attempt to build with X11 support [default=yes]],
--[
--  if test x$enableval = xyes; then
--    have_x=yes
--  else
--    have_x=no
--  fi
--],
--[
--  AC_CHECK_HEADER(X11/X.h,
--    [ have_x="yes" ],
--    [ have_x="no" ]
--  )
--]
--)
--AC_MSG_CHECKING(whether X11 support is to be enabled)
-+AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
-+
-+if test "x$have_x" = "xno"; then
-+   # If --without-x was passed, this will be "disabled" instead of "no" --
-+   # so always treat "no" as an error
-+   AC_MSG_ERROR(
-+[no X support found.  Use --x-includes and --x-libraries to specify the X
-+path on your system, or --without-x to disable X support.])
-+fi
-+
- if test "x$have_x" = "xyes"; then
--  x_dir="/usr/X11R6";
--  x_cflags="-I"$x_dir"/include"
--  x_libs="-L"$x_dir"/lib -lX11 -lXext"
--  AC_MSG_RESULT(enabling X11 support)
-+  if test "x$x_includes" != "x"; then
-+    x_cflags="-I$x_includes"
-+  fi
-+  if test "x$x_libraries" != "x"; then
-+    x_libs="-L$x_libraries -lX11 -lXext"
-+  fi
-   AM_CONDITIONAL(BUILD_X11, true)
-   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
- else
--  x_dir=""
-   x_cflags=""
-   x_libs=""
--  AC_MSG_RESULT(disabling X11 support)
-   AM_CONDITIONAL(BUILD_X11, false)
- fi
- 
-@@ -354,7 +352,9 @@
- fi
- AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
- AC_SUBST(BZ2LIBS)
--  
-+
-+AC_SUBST(requirements)
-+
- AC_OUTPUT([
- Makefile
- src/Makefile
-@@ -395,6 +395,9 @@
- echo "  GIF.....................: $gif_ok"
- echo "  ZLIB....................: $zlib_ok"
- echo "  BZIP2...................: $bz2_ok"
-+echo
-+echo
-+echo "Use MMX for extra speed...: $mmx"
- echo
- echo
- echo "Installation Path.........: $prefix"
diff --git a/graphics/imlib2/files/patch-filters b/graphics/imlib2/files/patch-filters
deleted file mode 100644
index e6e4f5293a8e..000000000000
--- a/graphics/imlib2/files/patch-filters
+++ /dev/null
@@ -1,57 +0,0 @@
---- src/modules/filters/Makefile.in.orig	Mon Mar 21 09:53:49 2005
-+++ src/modules/filters/Makefile.in	Mon Mar 21 09:55:08 2005
-@@ -104,13 +104,16 @@
- pkg_LTLIBRARIES = testfilter.la bumpmap.la colormod.la
- 
- testfilter_la_SOURCES = filter_test.c
--testfilter_la_LDFLAGS = -module -avoid-version
-+testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+testfilter_la_LIBADD = -lImlib2
- 
- bumpmap_la_SOURCES = filter_bumpmap.c
--bumpmap_la_LDFLAGS = -module -avoid-version
-+bumpmap_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bumpmap_la_LIBADD = -lImlib2
- 
- colormod_la_SOURCES = filter_colormod.c
--colormod_la_LDFLAGS = -module -avoid-version
-+colormod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+colormod_la_LIBADD = -lImlib2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
-@@ -121,11 +124,11 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
--testfilter_la_LIBADD = 
-+testfilter_la_DEPENDENCIES = 
- testfilter_la_OBJECTS =  filter_test.lo
--bumpmap_la_LIBADD = 
-+bumpmap_la_DEPENDENCIES = 
- bumpmap_la_OBJECTS =  filter_bumpmap.lo
--colormod_la_LIBADD = 
-+colormod_la_DEPENDENCIES = 
- colormod_la_OBJECTS =  filter_colormod.lo
- CFLAGS = @CFLAGS@
- COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
---- src/modules/filters/Makefile.am.orig	Mon Mar 21 09:53:44 2005
-+++ src/modules/filters/Makefile.am	Mon Mar 21 09:55:46 2005
-@@ -11,11 +11,14 @@
- pkg_LTLIBRARIES       = testfilter.la bumpmap.la colormod.la
- 
- testfilter_la_SOURCES = filter_test.c
--testfilter_la_LDFLAGS = -module -avoid-version
-+testfilter_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+testfilter_la_LIBADD  = -lImlib2
- 
- bumpmap_la_SOURCES    = filter_bumpmap.c
--bumpmap_la_LDFLAGS    = -module -avoid-version
-+bumpmap_la_LDFLAGS    = -module -avoid-version -L$(top_builddir)/src/lib/
-+bumpmap_la_LIBADD  = -lImlib2
- 
- colormod_la_SOURCES   = filter_colormod.c
--colormod_la_LDFLAGS   = -module -avoid-version
-+colormod_la_LDFLAGS   = -module -avoid-version -L$(top_builddir)/src/lib/
-+colormod_la_LIBADD  = -lImlib2
- 
diff --git a/graphics/imlib2/files/patch-loaders b/graphics/imlib2/files/patch-loaders
deleted file mode 100644
index 8026cf372db7..000000000000
--- a/graphics/imlib2/files/patch-loaders
+++ /dev/null
@@ -1,155 +0,0 @@
---- src/modules/loaders/Makefile.am.orig	Mon Mar 21 09:50:16 2005
-+++ src/modules/loaders/Makefile.am	Mon Mar 21 09:52:07 2005
-@@ -43,49 +43,49 @@
- lbm.la
- 
- jpeg_la_SOURCES      = loader_jpeg.c
--jpeg_la_LDFLAGS      = -module -avoid-version
--jpeg_la_LIBADD       = @JPEGLIBS@
-+jpeg_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+jpeg_la_LIBADD       = @JPEGLIBS@ -lImlib2
- 
- png_la_SOURCES       = loader_png.c
--png_la_LDFLAGS       = -module -avoid-version
--png_la_LIBADD        = @PNGLIBS@
-+png_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+png_la_LIBADD        = @PNGLIBS@ -lImlib2
-                        
- tiff_la_SOURCES      = loader_tiff.c
--tiff_la_LDFLAGS      = -module -avoid-version
--tiff_la_LIBADD       = @TIFFLIBS@
-+tiff_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+tiff_la_LIBADD       = @TIFFLIBS@ -lImlib2
- 
- gif_la_SOURCES       = loader_gif.c
--gif_la_LDFLAGS       = -module -avoid-version
--gif_la_LIBADD        = @GIFLIBS@
-+gif_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+gif_la_LIBADD        = @GIFLIBS@ -lImlib2
- 
- zlib_la_SOURCES      = loader_zlib.c
--zlib_la_LDFLAGS      = -module -avoid-version
--zlib_la_LIBADD       = @ZLIBLIBS@ 
-+zlib_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+zlib_la_LIBADD       = @ZLIBLIBS@  -lImlib2
- 
- bz2_la_SOURCES       = loader_bz2.c
--bz2_la_LDFLAGS       = -module -avoid-version
--bz2_la_LIBADD        = @BZ2LIBS@ 
-+bz2_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+bz2_la_LIBADD        = @BZ2LIBS@  -lImlib2
- 
- pnm_la_SOURCES       = loader_pnm.c
--pnm_la_LDFLAGS       = -module -avoid-version
--pnm_la_LIBADD        = 
-+pnm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+pnm_la_LIBADD        = -lImlib2
- 
- argb_la_SOURCES      = loader_argb.c
--argb_la_LDFLAGS      = -module -avoid-version
--argb_la_LIBADD       = 
-+argb_la_LDFLAGS      = -module -avoid-version -L$(top_builddir)/src/lib/
-+argb_la_LIBADD       = -lImlib2
- 
- bmp_la_SOURCES       = loader_bmp.c
--bmp_la_LDFLAGS       = -module -avoid-version
--bmp_la_LIBADD        = 
-+bmp_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+bmp_la_LIBADD        = -lImlib2
- 
- xpm_la_SOURCES       = loader_xpm.c
--xpm_la_LDFLAGS       = -module -avoid-version
--xpm_la_LIBADD        = 
-+xpm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+xpm_la_LIBADD        = -lImlib2
- 
- tga_la_SOURCES       = loader_tga.c
--tga_la_LDFLAGS       = -module -avoid-version
--tga_la_LIBADD        = 
-+tga_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+tga_la_LIBADD        = -lImlib2
- 
- lbm_la_SOURCES       = loader_lbm.c
--lbm_la_LDFLAGS       = -module -avoid-version
--lbm_la_LIBADD        = 
-+lbm_la_LDFLAGS       = -module -avoid-version -L$(top_builddir)/src/lib/
-+lbm_la_LIBADD        = -lImlib2
---- src/modules/loaders/Makefile.in.orig	Mon Mar 21 09:47:45 2005
-+++ src/modules/loaders/Makefile.in	Mon Mar 21 09:50:06 2005
-@@ -113,52 +113,52 @@
- 
- 
- jpeg_la_SOURCES = loader_jpeg.c
--jpeg_la_LDFLAGS = -module -avoid-version
--jpeg_la_LIBADD = @JPEGLIBS@
-+jpeg_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+jpeg_la_LIBADD = @JPEGLIBS@ -lImlib2
- 
- png_la_SOURCES = loader_png.c
--png_la_LDFLAGS = -module -avoid-version
--png_la_LIBADD = @PNGLIBS@
-+png_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+png_la_LIBADD = @PNGLIBS@ -lImlib2
- 
- tiff_la_SOURCES = loader_tiff.c
--tiff_la_LDFLAGS = -module -avoid-version
--tiff_la_LIBADD = @TIFFLIBS@
-+tiff_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+tiff_la_LIBADD = @TIFFLIBS@ -lImlib2
- 
- gif_la_SOURCES = loader_gif.c
--gif_la_LDFLAGS = -module -avoid-version
--gif_la_LIBADD = @GIFLIBS@
-+gif_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+gif_la_LIBADD = @GIFLIBS@ -lImlib2
- 
- zlib_la_SOURCES = loader_zlib.c
--zlib_la_LDFLAGS = -module -avoid-version
--zlib_la_LIBADD = @ZLIBLIBS@ 
-+zlib_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+zlib_la_LIBADD = @ZLIBLIBS@  -lImlib2
- 
- bz2_la_SOURCES = loader_bz2.c
--bz2_la_LDFLAGS = -module -avoid-version
--bz2_la_LIBADD = @BZ2LIBS@ 
-+bz2_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bz2_la_LIBADD = @BZ2LIBS@  -lImlib2
- 
- pnm_la_SOURCES = loader_pnm.c
--pnm_la_LDFLAGS = -module -avoid-version
--pnm_la_LIBADD = 
-+pnm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+pnm_la_LIBADD = -lImlib2
- 
- argb_la_SOURCES = loader_argb.c
--argb_la_LDFLAGS = -module -avoid-version
--argb_la_LIBADD = 
-+argb_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+argb_la_LIBADD = -lImlib2
- 
- bmp_la_SOURCES = loader_bmp.c
--bmp_la_LDFLAGS = -module -avoid-version
--bmp_la_LIBADD = 
-+bmp_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+bmp_la_LIBADD = -lImlib2
- 
- xpm_la_SOURCES = loader_xpm.c
--xpm_la_LDFLAGS = -module -avoid-version
--xpm_la_LIBADD = 
-+xpm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+xpm_la_LIBADD = -lImlib2
- 
- tga_la_SOURCES = loader_tga.c
--tga_la_LDFLAGS = -module -avoid-version
--tga_la_LIBADD = 
-+tga_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+tga_la_LIBADD = -lImlib2
- 
- lbm_la_SOURCES = loader_lbm.c
--lbm_la_LDFLAGS = -module -avoid-version
--lbm_la_LIBADD = 
-+lbm_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/lib/
-+lbm_la_LIBADD = -lImlib2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES =