From 193c7c0a452407cc8d0571d6de8901ba568f49d4 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Wed, 20 Jan 1999 22:49:48 +0000 Subject: Upgrade to 1.9.1. --- graphics/imlib/Makefile | 6 ++--- graphics/imlib/distinfo | 2 +- graphics/imlib/files/patch-aa | 46 +++++++++++++++++++------------------- graphics/imlib/files/patch-ac | 24 ++++++++++---------- graphics/imlib/pkg-plist | 36 ++--------------------------- graphics/imlib2-tmp/Makefile | 6 ++--- graphics/imlib2-tmp/distinfo | 2 +- graphics/imlib2-tmp/files/patch-aa | 46 +++++++++++++++++++------------------- graphics/imlib2-tmp/pkg-plist | 36 ++--------------------------- graphics/imlib2/Makefile | 6 ++--- graphics/imlib2/distinfo | 2 +- graphics/imlib2/files/patch-aa | 46 +++++++++++++++++++------------------- graphics/imlib2/pkg-plist | 36 ++--------------------------- 13 files changed, 99 insertions(+), 195 deletions(-) (limited to 'graphics') diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 18378094f59c..98b8b4cb62f4 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: imlib -# Version required: 1.9.0 +# Version required: 1.9.1 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ # -DISTNAME= imlib-1.9.0 +DISTNAME= imlib-1.9.1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \ ftp://ftp.geo.net/pub/gnome/sources/latest/ \ diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index d1623e188e28..a5924a68563f 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9 +MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa index 6430d0c4b25e..34ec3b55d5a2 100644 --- a/graphics/imlib/files/patch-aa +++ b/graphics/imlib/files/patch-aa @@ -1,7 +1,7 @@ ---- configure.orig Thu Jan 14 17:51:21 1999 -+++ configure Thu Jan 14 17:56:31 1999 -@@ -1725,8 +1725,8 @@ - echo "configure:1726: checking If dynamic linking works on this system" >&5 +--- configure.orig Sat Jan 16 01:23:28 1999 ++++ configure Thu Jan 21 06:12:39 1999 +@@ -2173,8 +2173,8 @@ + echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" @@ -11,7 +11,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -@@ -1763,8 +1763,8 @@ +@@ -2223,8 +2223,8 @@ #define USE_GMODULE 1 EOF @@ -22,14 +22,14 @@ echo "$ac_t""yes" 1>&6 -@@ -1788,140 +1788,6 @@ +@@ -2248,140 +2248,6 @@ DYNAMIC_MODULES_WORK_TRUE='#' DYNAMIC_MODULES_WORK_FALSE= fi -# Extract the first word of "djpeg", so it can be a program name with args. -set dummy djpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1795: checking for $ac_word" >&5 +-echo "configure:2255: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -60,7 +60,7 @@ -# Extract the first word of "cjpeg", so it can be a program name with args. -set dummy cjpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1826: checking for $ac_word" >&5 +-echo "configure:2286: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -92,7 +92,7 @@ -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1858: checking for $ac_word" >&5 +-echo "configure:2318: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -128,7 +128,7 @@ -# Extract the first word of "giftopnm", so it can be a program name with args. -set dummy giftopnm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1894: checking for $ac_word" >&5 +-echo "configure:2354: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -162,55 +162,55 @@ - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:1928: checking how to run the C preprocessor" >&5 -@@ -3527,7 +3393,7 @@ + echo "configure:2388: checking how to run the C preprocessor" >&5 +@@ -3987,7 +3853,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXext $X_LIBS $LIBS" +LIBS="-lXext -lX11 $X_LIBS $LIBS" cat > conftest.$ac_ext <&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff $GX_LIBS $LIBS" +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS" cat > conftest.$ac_ext <&6 --echo "configure:4095: checking for gif_lib.h" >&5 +-echo "configure:4555: checking for gif_lib.h" >&5 +ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4095: checking for giflib/gif_lib.h" >&5 ++echo "configure:4555: checking for giflib/gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4317,26 +4183,6 @@ + { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -4777,26 +4643,6 @@ else echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 fi - -echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 --echo "configure:4323: checking for libpng version other than 1.0.2" >&5 +-echo "configure:4783: checking for libpng version other than 1.0.2" >&5 -cat > conftest.$ac_ext < -PNG_LIBPNG_VER_STRING diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac index a3bb58ce18ce..fecd0d89ba21 100644 --- a/graphics/imlib/files/patch-ac +++ b/graphics/imlib/files/patch-ac @@ -1,5 +1,5 @@ ---- config/Makefile.in.orig Thu Jan 14 18:24:27 1999 -+++ config/Makefile.in Thu Jan 14 18:24:37 1999 +--- config/Makefile.in.orig Sat Jan 16 02:07:15 1999 ++++ config/Makefile.in Thu Jan 21 06:13:27 1999 @@ -23,7 +23,7 @@ sbindir = @sbindir@ libexecdir = @libexecdir@ @@ -9,14 +9,14 @@ sharedstatedir = @sharedstatedir@ localstatedir = @localstatedir@ libdir = @libdir@ ---- Imlib/Makefile.in.orig Wed Jan 13 06:05:39 1999 -+++ Imlib/Makefile.in Thu Jan 14 18:07:58 1999 -@@ -127,12 +127,12 @@ +--- Imlib/Makefile.in.orig Sat Jan 16 02:07:15 1999 ++++ Imlib/Makefile.in Thu Jan 21 06:14:23 1999 +@@ -130,12 +130,12 @@ save.c \ snprintf.c --libImlib_la_LDFLAGS = -version-info 10:0:9 -+libImlib_la_LDFLAGS = -version-info 2:0:0 +-libImlib_la_LDFLAGS = -version-info 10:1:9 ++libImlib_la_LDFLAGS = -version-info 2:1:0 libImlib_la_LDDADD = $(SUPPORT_LIBS) DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\" -DCJPEG_PROG=\"@CJPEG_PROG@\" \ @@ -26,14 +26,14 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gdk_imlib/Makefile.in.orig Wed Jan 13 06:05:37 1999 -+++ gdk_imlib/Makefile.in Thu Jan 14 18:07:58 1999 -@@ -164,14 +164,14 @@ +--- gdk_imlib/Makefile.in.orig Sat Jan 16 02:07:10 1999 ++++ gdk_imlib/Makefile.in Thu Jan 21 06:14:48 1999 +@@ -167,14 +167,14 @@ save.c \ modules.c --libgdk_imlib_la_LDFLAGS = -version-info 10:0:9 -+libgdk_imlib_la_LDFLAGS = -version-info 2:0:0 +-libgdk_imlib_la_LDFLAGS = -version-info 10:1:9 ++libgdk_imlib_la_LDFLAGS = -version-info 2:1:0 libgdk_imlib_la_LIBADD = $(GMODULE_LIBS) include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist index 5867cebea5ab..782906f0873f 100644 --- a/graphics/imlib/pkg-plist +++ b/graphics/imlib/pkg-plist @@ -11,43 +11,11 @@ include/gdk_imlib_types.h lib/libImlib.a lib/libImlib.la lib/libImlib.so -lib/libImlib.so.2 +lib/libImlib.so.2.1 lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so -lib/libgdk_imlib.so.2 -lib/libimlib-bmp.a -lib/libimlib-bmp.la -lib/libimlib-bmp.so -lib/libimlib-bmp.so.0 -lib/libimlib-gif.a -lib/libimlib-gif.la -lib/libimlib-gif.so -lib/libimlib-gif.so.0 -lib/libimlib-jpeg.a -lib/libimlib-jpeg.la -lib/libimlib-jpeg.so -lib/libimlib-jpeg.so.0 -lib/libimlib-png.a -lib/libimlib-png.la -lib/libimlib-png.so -lib/libimlib-png.so.0 -lib/libimlib-ppm.a -lib/libimlib-ppm.la -lib/libimlib-ppm.so -lib/libimlib-ppm.so.0 -lib/libimlib-ps.a -lib/libimlib-ps.la -lib/libimlib-ps.so -lib/libimlib-ps.so.0 -lib/libimlib-tiff.a -lib/libimlib-tiff.la -lib/libimlib-tiff.so -lib/libimlib-tiff.so.0 -lib/libimlib-xpm.a -lib/libimlib-xpm.la -lib/libimlib-xpm.so -lib/libimlib-xpm.so.0 +lib/libgdk_imlib.so.2.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index 18378094f59c..98b8b4cb62f4 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: imlib -# Version required: 1.9.0 +# Version required: 1.9.1 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ # -DISTNAME= imlib-1.9.0 +DISTNAME= imlib-1.9.1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \ ftp://ftp.geo.net/pub/gnome/sources/latest/ \ diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo index d1623e188e28..a5924a68563f 100644 --- a/graphics/imlib2-tmp/distinfo +++ b/graphics/imlib2-tmp/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9 +MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa index 6430d0c4b25e..34ec3b55d5a2 100644 --- a/graphics/imlib2-tmp/files/patch-aa +++ b/graphics/imlib2-tmp/files/patch-aa @@ -1,7 +1,7 @@ ---- configure.orig Thu Jan 14 17:51:21 1999 -+++ configure Thu Jan 14 17:56:31 1999 -@@ -1725,8 +1725,8 @@ - echo "configure:1726: checking If dynamic linking works on this system" >&5 +--- configure.orig Sat Jan 16 01:23:28 1999 ++++ configure Thu Jan 21 06:12:39 1999 +@@ -2173,8 +2173,8 @@ + echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" @@ -11,7 +11,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -@@ -1763,8 +1763,8 @@ +@@ -2223,8 +2223,8 @@ #define USE_GMODULE 1 EOF @@ -22,14 +22,14 @@ echo "$ac_t""yes" 1>&6 -@@ -1788,140 +1788,6 @@ +@@ -2248,140 +2248,6 @@ DYNAMIC_MODULES_WORK_TRUE='#' DYNAMIC_MODULES_WORK_FALSE= fi -# Extract the first word of "djpeg", so it can be a program name with args. -set dummy djpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1795: checking for $ac_word" >&5 +-echo "configure:2255: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -60,7 +60,7 @@ -# Extract the first word of "cjpeg", so it can be a program name with args. -set dummy cjpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1826: checking for $ac_word" >&5 +-echo "configure:2286: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -92,7 +92,7 @@ -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1858: checking for $ac_word" >&5 +-echo "configure:2318: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -128,7 +128,7 @@ -# Extract the first word of "giftopnm", so it can be a program name with args. -set dummy giftopnm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1894: checking for $ac_word" >&5 +-echo "configure:2354: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -162,55 +162,55 @@ - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:1928: checking how to run the C preprocessor" >&5 -@@ -3527,7 +3393,7 @@ + echo "configure:2388: checking how to run the C preprocessor" >&5 +@@ -3987,7 +3853,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXext $X_LIBS $LIBS" +LIBS="-lXext -lX11 $X_LIBS $LIBS" cat > conftest.$ac_ext <&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff $GX_LIBS $LIBS" +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS" cat > conftest.$ac_ext <&6 --echo "configure:4095: checking for gif_lib.h" >&5 +-echo "configure:4555: checking for gif_lib.h" >&5 +ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4095: checking for giflib/gif_lib.h" >&5 ++echo "configure:4555: checking for giflib/gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4317,26 +4183,6 @@ + { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -4777,26 +4643,6 @@ else echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 fi - -echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 --echo "configure:4323: checking for libpng version other than 1.0.2" >&5 +-echo "configure:4783: checking for libpng version other than 1.0.2" >&5 -cat > conftest.$ac_ext < -PNG_LIBPNG_VER_STRING diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist index 5867cebea5ab..782906f0873f 100644 --- a/graphics/imlib2-tmp/pkg-plist +++ b/graphics/imlib2-tmp/pkg-plist @@ -11,43 +11,11 @@ include/gdk_imlib_types.h lib/libImlib.a lib/libImlib.la lib/libImlib.so -lib/libImlib.so.2 +lib/libImlib.so.2.1 lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so -lib/libgdk_imlib.so.2 -lib/libimlib-bmp.a -lib/libimlib-bmp.la -lib/libimlib-bmp.so -lib/libimlib-bmp.so.0 -lib/libimlib-gif.a -lib/libimlib-gif.la -lib/libimlib-gif.so -lib/libimlib-gif.so.0 -lib/libimlib-jpeg.a -lib/libimlib-jpeg.la -lib/libimlib-jpeg.so -lib/libimlib-jpeg.so.0 -lib/libimlib-png.a -lib/libimlib-png.la -lib/libimlib-png.so -lib/libimlib-png.so.0 -lib/libimlib-ppm.a -lib/libimlib-ppm.la -lib/libimlib-ppm.so -lib/libimlib-ppm.so.0 -lib/libimlib-ps.a -lib/libimlib-ps.la -lib/libimlib-ps.so -lib/libimlib-ps.so.0 -lib/libimlib-tiff.a -lib/libimlib-tiff.la -lib/libimlib-tiff.so -lib/libimlib-tiff.so.0 -lib/libimlib-xpm.a -lib/libimlib-xpm.la -lib/libimlib-xpm.so -lib/libimlib-xpm.so.0 +lib/libgdk_imlib.so.2.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 18378094f59c..98b8b4cb62f4 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,12 +1,12 @@ # New ports collection makefile for: imlib -# Version required: 1.9.0 +# Version required: 1.9.1 # Date created: 10 June 1997 # Whom: Yukihiro Nakai # -# $Id: Makefile,v 1.39 1999/01/04 08:43:07 vanilla Exp $ +# $Id: Makefile,v 1.40 1999/01/14 16:53:36 vanilla Exp $ # -DISTNAME= imlib-1.9.0 +DISTNAME= imlib-1.9.1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/latest/ \ ftp://ftp.geo.net/pub/gnome/sources/latest/ \ diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index d1623e188e28..a5924a68563f 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.0.tar.gz) = 493d4b98bd411504f243d5775b76fea9 +MD5 (imlib-1.9.1.tar.gz) = 98115bf7568a19ee80a7be87a48d16c3 diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa index 6430d0c4b25e..34ec3b55d5a2 100644 --- a/graphics/imlib2/files/patch-aa +++ b/graphics/imlib2/files/patch-aa @@ -1,7 +1,7 @@ ---- configure.orig Thu Jan 14 17:51:21 1999 -+++ configure Thu Jan 14 17:56:31 1999 -@@ -1725,8 +1725,8 @@ - echo "configure:1726: checking If dynamic linking works on this system" >&5 +--- configure.orig Sat Jan 16 01:23:28 1999 ++++ configure Thu Jan 21 06:12:39 1999 +@@ -2173,8 +2173,8 @@ + echo "configure:2174: checking If dynamic linking works on this system" >&5 oLIBS="$LIBS" oCFLAGS="$CFLAGS" - LIBS="$LIBS `glib-config --libs gmodule`" @@ -11,7 +11,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else -@@ -1763,8 +1763,8 @@ +@@ -2223,8 +2223,8 @@ #define USE_GMODULE 1 EOF @@ -22,14 +22,14 @@ echo "$ac_t""yes" 1>&6 -@@ -1788,140 +1788,6 @@ +@@ -2248,140 +2248,6 @@ DYNAMIC_MODULES_WORK_TRUE='#' DYNAMIC_MODULES_WORK_FALSE= fi -# Extract the first word of "djpeg", so it can be a program name with args. -set dummy djpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1795: checking for $ac_word" >&5 +-echo "configure:2255: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -60,7 +60,7 @@ -# Extract the first word of "cjpeg", so it can be a program name with args. -set dummy cjpeg; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1826: checking for $ac_word" >&5 +-echo "configure:2286: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -92,7 +92,7 @@ -# Extract the first word of "convert", so it can be a program name with args. -set dummy convert; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1858: checking for $ac_word" >&5 +-echo "configure:2318: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -128,7 +128,7 @@ -# Extract the first word of "giftopnm", so it can be a program name with args. -set dummy giftopnm; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:1894: checking for $ac_word" >&5 +-echo "configure:2354: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else @@ -162,55 +162,55 @@ - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:1928: checking how to run the C preprocessor" >&5 -@@ -3527,7 +3393,7 @@ + echo "configure:2388: checking how to run the C preprocessor" >&5 +@@ -3987,7 +3853,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lXext $X_LIBS $LIBS" +LIBS="-lXext -lX11 $X_LIBS $LIBS" cat > conftest.$ac_ext <&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff $GX_LIBS $LIBS" +LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS" cat > conftest.$ac_ext <&6 --echo "configure:4095: checking for gif_lib.h" >&5 +-echo "configure:4555: checking for gif_lib.h" >&5 +ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6 -+echo "configure:4095: checking for giflib/gif_lib.h" >&5 ++echo "configure:4555: checking for giflib/gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" - { (eval echo configure:4105: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -@@ -4317,26 +4183,6 @@ + { (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +@@ -4777,26 +4643,6 @@ else echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2 fi - -echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6 --echo "configure:4323: checking for libpng version other than 1.0.2" >&5 +-echo "configure:4783: checking for libpng version other than 1.0.2" >&5 -cat > conftest.$ac_ext < -PNG_LIBPNG_VER_STRING diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist index 5867cebea5ab..782906f0873f 100644 --- a/graphics/imlib2/pkg-plist +++ b/graphics/imlib2/pkg-plist @@ -11,43 +11,11 @@ include/gdk_imlib_types.h lib/libImlib.a lib/libImlib.la lib/libImlib.so -lib/libImlib.so.2 +lib/libImlib.so.2.1 lib/libgdk_imlib.a lib/libgdk_imlib.la lib/libgdk_imlib.so -lib/libgdk_imlib.so.2 -lib/libimlib-bmp.a -lib/libimlib-bmp.la -lib/libimlib-bmp.so -lib/libimlib-bmp.so.0 -lib/libimlib-gif.a -lib/libimlib-gif.la -lib/libimlib-gif.so -lib/libimlib-gif.so.0 -lib/libimlib-jpeg.a -lib/libimlib-jpeg.la -lib/libimlib-jpeg.so -lib/libimlib-jpeg.so.0 -lib/libimlib-png.a -lib/libimlib-png.la -lib/libimlib-png.so -lib/libimlib-png.so.0 -lib/libimlib-ppm.a -lib/libimlib-ppm.la -lib/libimlib-ppm.so -lib/libimlib-ppm.so.0 -lib/libimlib-ps.a -lib/libimlib-ps.la -lib/libimlib-ps.so -lib/libimlib-ps.so.0 -lib/libimlib-tiff.a -lib/libimlib-tiff.la -lib/libimlib-tiff.so -lib/libimlib-tiff.so.0 -lib/libimlib-xpm.a -lib/libimlib-xpm.la -lib/libimlib-xpm.so -lib/libimlib-xpm.so.0 +lib/libgdk_imlib.so.2.1 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm etc/imlib -- cgit v1.2.3